gac 0.18.1__py3-none-any.whl → 0.19.0__py3-none-any.whl

gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "0.18.1"
+__version__ = "0.19.0"

gac/cli.py

@@ -36,10 +36,9 @@ logger = logging.getLogger(__name__)
 @click.option(
     "--scope",
     "-s",
-    is_flag=False,
-    flag_value="",
-    default=None,
-    help="Add a scope to the commit message. If used without a value, the LLM will determine an appropriate scope.",
+    is_flag=True,
+    default=False,
+    help="Infer an appropriate scope for the commit message",
 )
 @click.option("--hint", "-h", default="", help="Additional context to include in the prompt")
 # Model options
@@ -65,7 +64,7 @@ def cli(
     one_liner: bool = False,
     push: bool = False,
     show_prompt: bool = False,
-    scope: str = None,
+    scope: bool = False,
     quiet: bool = False,
     yes: bool = False,
     hint: str = "",
@@ -88,10 +87,8 @@ def cli(
         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
+        # Determine if we should infer scope based on -s flag or always_include_scope setting
+        infer_scope = bool(scope or config.get("always_include_scope", False))
 
         try:
             main(
@@ -100,7 +97,7 @@ def cli(
                 hint=hint,
                 one_liner=one_liner,
                 show_prompt=show_prompt,
-                scope=effective_scope,
+                infer_scope=bool(infer_scope),
                 require_confirmation=not yes,
                 push=push,
                 quiet=quiet,
@@ -110,13 +107,16 @@ def cli(
         except Exception as e:
             handle_error(e, exit_program=True)
     else:
+        # Determine if we should infer scope based on -s flag or always_include_scope setting
+        infer_scope = bool(scope or config.get("always_include_scope", False))
+
         ctx.obj = {
             "add_all": add_all,
             "log_level": log_level,
             "one_liner": one_liner,
             "push": push,
             "show_prompt": show_prompt,
-            "scope": scope,
+            "scope": infer_scope,
             "quiet": quiet,
             "yes": yes,
             "hint": hint,

gac/main.py

@@ -34,7 +34,7 @@ def main(
     hint: str = "",
     one_liner: bool = False,
     show_prompt: bool = False,
-    scope: str | None = None,
+    infer_scope: bool = False,
     require_confirmation: bool = True,
     push: bool = False,
     quiet: bool = False,
@@ -101,7 +101,7 @@ def main(
         diff_stat=diff_stat,
         one_liner=one_liner,
         hint=hint,
-        scope=scope,
+        infer_scope=infer_scope,
     )
 
     if show_prompt:
@@ -202,7 +202,7 @@ def main(
                                 diff_stat=diff_stat,
                                 one_liner=one_liner,
                                 hint=combined_hint,
-                                scope=scope,
+                                infer_scope=infer_scope,
                             )
                         else:
                             # No hint given, just reroll with same prompts

gac/prompt.py

@@ -73,43 +73,7 @@ If you cannot confidently determine a type, use 'chore'.
 Do NOT include a scope in your commit prefix.
 </conventions_no_scope>
 
-<conventions_scope_provided>
-You MUST write a conventional commit message with EXACTLY ONE type and the REQUIRED scope '{scope}'.
-
-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 (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
-- test: Adding/modifying tests
-- build: Changes to build system/dependencies
-- ci: Changes to CI configuration
-- chore: Miscellaneous changes not affecting src/test files
-
-CORRECT EXAMPLES (these formats are correct):
-✅ feat({scope}): add new feature
-✅ fix({scope}): resolve bug
-✅ refactor({scope}): improve code structure
-✅ chore({scope}): update dependencies
-
-INCORRECT EXAMPLES (these formats are wrong and must NOT be used):
-❌ chore: feat({scope}): description
-❌ fix: refactor({scope}): description
-❌ feat: feat({scope}): description
-❌ chore: chore({scope}): description
-
-You MUST NOT prefix the type({scope}) with another type. Use EXACTLY ONE type, which MUST include the scope in parentheses.
-</conventions_scope_provided>
-
-<conventions_scope_inferred>
+<conventions_with_scope>
 You MUST write a conventional commit message with EXACTLY ONE type and an inferred scope.
 
 FORMAT: type(scope): description
@@ -156,7 +120,7 @@ INCORRECT EXAMPLES (these formats are wrong and must NOT be used):
 ❌ chore: chore(component): description
 
 You MUST NOT prefix the type(scope) with another type. Use EXACTLY ONE type, which MUST include the scope in parentheses.
-</conventions_scope_inferred>
+</conventions_with_scope>
 
 <hint>
 Additional context provided by the user: <hint_text></hint_text>
@@ -235,8 +199,8 @@ def build_prompt(
     processed_diff: str,
     diff_stat: str = "",
     one_liner: bool = False,
+    infer_scope: bool = False,
     hint: str = "",
-    scope: str | None = None,
 ) -> tuple[str, str]:
     """Build system and user prompts for the AI model using the provided template and git information.
 
@@ -245,47 +209,29 @@ def build_prompt(
         processed_diff: Git diff output, already preprocessed and ready to use
         diff_stat: Git diff stat output showing file changes summary
         one_liner: Whether to request a one-line commit message
+        infer_scope: Whether to infer scope for the commit message
         hint: Optional hint to guide the AI
-        scope: Optional scope parameter. None = no scope, "infer" = infer scope, any other string = use as scope
 
     Returns:
         Tuple of (system_prompt, user_prompt) ready to be sent to an AI model
     """
     template = load_prompt_template()
 
-    # Select the appropriate conventions section based on scope parameter
+    # Select the appropriate conventions section based on infer_scope parameter
     try:
-        logger.debug(f"Processing scope parameter: {scope}")
-        if scope is None:
+        logger.debug(f"Processing infer_scope parameter: {infer_scope}")
+        if infer_scope:
+            # User wants to infer a scope from changes (any value other than None)
+            logger.debug("Using inferred-scope conventions")
+            template = re.sub(r"<conventions_no_scope>.*?</conventions_no_scope>\n", "", template, flags=re.DOTALL)
+            template = template.replace("<conventions_with_scope>", "<conventions>")
+            template = template.replace("</conventions_with_scope>", "</conventions>")
+        else:
             # No scope - use the plain conventions section
             logger.debug("Using no-scope conventions")
-            template = re.sub(
-                r"<conventions_scope_provided>.*?</conventions_scope_provided>\n", "", template, flags=re.DOTALL
-            )
-            template = re.sub(
-                r"<conventions_scope_inferred>.*?</conventions_scope_inferred>\n", "", template, flags=re.DOTALL
-            )
+            template = re.sub(r"<conventions_with_scope>.*?</conventions_with_scope>\n", "", template, flags=re.DOTALL)
             template = template.replace("<conventions_no_scope>", "<conventions>")
             template = template.replace("</conventions_no_scope>", "</conventions>")
-        elif scope == "infer" or scope == "":
-            # User wants to infer a scope from changes (either with "infer" or empty string)
-            logger.debug(f"Using inferred-scope conventions (scope={scope})")
-            template = re.sub(
-                r"<conventions_scope_provided>.*?</conventions_scope_provided>\n", "", template, flags=re.DOTALL
-            )
-            template = re.sub(r"<conventions_no_scope>.*?</conventions_no_scope>\n", "", template, flags=re.DOTALL)
-            template = template.replace("<conventions_scope_inferred>", "<conventions>")
-            template = template.replace("</conventions_scope_inferred>", "</conventions>")
-        else:
-            # User provided a specific scope
-            logger.debug(f"Using provided-scope conventions with scope '{scope}'")
-            template = re.sub(
-                r"<conventions_scope_inferred>.*?</conventions_scope_inferred>\n", "", template, flags=re.DOTALL
-            )
-            template = re.sub(r"<conventions_no_scope>.*?</conventions_no_scope>\n", "", template, flags=re.DOTALL)
-            template = template.replace("<conventions_scope_provided>", "<conventions>")
-            template = template.replace("</conventions_scope_provided>", "</conventions>")
-            template = template.replace("{scope}", scope)
     except Exception as e:
         logger.error(f"Error processing scope parameter: {e}")
         # Fallback to no scope if there's an error
@@ -316,17 +262,17 @@ 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:
+    # Clean up examples sections based on infer_scope settings
+    if infer_scope:
+        # With scope (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>")
+    else:
         # 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.18.1.dist-info → gac-0.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 0.18.1
+Version: 0.19.0
 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
@@ -58,11 +58,11 @@ Description-Content-Type: text/markdown
 
 ## Features
 
-- **AI-Powered Commit Messages:** Automatically generates clear, concise, and context-aware commit messages using large language models.
+- **LLM-Powered Commit Messages:** Automatically generates clear, concise, and context-aware commit messages using large language models.
 - **Deep Contextual Analysis:** Understands your code by analyzing staged changes, repository structure, and recent commit history to provide highly relevant suggestions.
 - **Multi-Provider & Model Support:** Flexibly works with various leading AI providers (like Anthropic, Cerebras, Groq, OpenAI) and models, easily configured through an interactive setup or environment variables.
 - **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`).
+- **Extensive Customization:** Tailor commit messages to your needs with a rich set of flags, including one-liners (`-o`), AI hints (`-h`), scope inference (`-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.
 - **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).

{gac-0.18.1.dist-info → gac-0.19.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 gac/__init__.py,sha256=z9yGInqtycFIT3g1ca24r-A3699hKVaRqGUI79wsmMc,415
-gac/__version__.py,sha256=FEdRQL4YfxDEwmcVMleEDpoi0wk6-1Ky9NDE0G82At4,67
+gac/__version__.py,sha256=EzEhcsqRK8CRB_s66jICyS0xRG0K29SUvbzZAdpl0mU,67
 gac/ai.py,sha256=vncnizPce4QbbpddjVORdK2X95rIJwWbJxmIhjscQSU,6357
-gac/cli.py,sha256=KsagQerqcf2uqGS4HjV_U1AUBtY3DPmYLsTj08riZmE,4545
+gac/cli.py,sha256=eQS8S7v6p0CfN9wtr239ujYGTi9rKl-KV7STX2U-C3w,4581
 gac/config.py,sha256=wSgEDjtis7Vk1pv5VPvYmJyD9-tymDS6GiUHjnCMbIM,1486
 gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
 gac/constants.py,sha256=MAxdASGncfZY1TdKGdhJZ0wvTBEU3gTN6KEdw8n3Bd8,4844
@@ -9,12 +9,12 @@ gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
 gac/errors.py,sha256=3vIRMQ2QF3sP9_rPfXAFuu5ZSjIVX4FxM-FAuiR8N-8,7416
 gac/git.py,sha256=MS2m4fv8h4mau1djFG1aje9NXTmkGsjPO9w18LqNGX0,6031
 gac/init_cli.py,sha256=aNllguofrcLn0ML9tzLVWFkPbwlAvCM9m7undHhMLEo,1825
-gac/main.py,sha256=IlT6iOsdwb0uSJJ1A69FaBrq-gFGpnhCcAjJLdHp20w,11962
+gac/main.py,sha256=WI7mxIbL05neQr1VfoopOeZKIonwpwFeZCt_4VFewPY,11987
 gac/preprocess.py,sha256=4igtZ9OTHgTpqwlJmbcGaqzmdD0HHCZJwsZ9eG118Gk,15360
-gac/prompt.py,sha256=Wd-CguIQnVNj_49dXz0Da2Osxx8sfTzRypx_rq2rFWk,20052
+gac/prompt.py,sha256=_fv24XU3DZE_S72vcdUYnNkmy-_KXnr1Vlc-9okop7E,17263
 gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
-gac-0.18.1.dist-info/METADATA,sha256=ZnTlQJHNf_5xWBy_o362nncpqfG7u4scdyPFdmLAqbI,8406
-gac-0.18.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-0.18.1.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-0.18.1.dist-info/licenses/LICENSE,sha256=s11puNmYfzwoSwG96nhOJe268Y1QFckr8-Hmzo3_eJE,1087
-gac-0.18.1.dist-info/RECORD,,
+gac-0.19.0.dist-info/METADATA,sha256=AU9iYNzYzRDuzMMh_VpbE8B-K2OBHyuEiLyj93Pbl-A,8410
+gac-0.19.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-0.19.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-0.19.0.dist-info/licenses/LICENSE,sha256=s11puNmYfzwoSwG96nhOJe268Y1QFckr8-Hmzo3_eJE,1087
+gac-0.19.0.dist-info/RECORD,,