gac 0.16.3__py3-none-any.whl → 0.17.2__py3-none-any.whl

gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "0.16.3"
+__version__ = "0.17.2"

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/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/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:

gac/git.py

@@ -161,11 +161,16 @@ def push_changes() -> bool:
         return False
 
     try:
-        run_git_command(["push"])
+        # Use raise_on_error=True to properly catch push failures
+        run_subprocess(["git", "push"], raise_on_error=True, strip_output=True)
         return True
-    except GitError as e:
-        if "fatal: No configured push destination" in str(e):
+    except subprocess.CalledProcessError as e:
+        error_msg = e.stderr.strip() if e.stderr else str(e)
+        if "fatal: No configured push destination" in error_msg:
             logger.error("No configured push destination.")
         else:
-            logger.error(f"Failed to push changes: {e}")
+            logger.error(f"Failed to push changes: {error_msg}")
+        return False
+    except Exception as e:
+        logger.error(f"Failed to push changes: {e}")
         return False

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
@@ -233,15 +270,13 @@ def main(
                 logger.info("Changes pushed successfully")
                 console.print("[green]Changes pushed successfully[/green]")
             else:
-                handle_error(
-                    GitError("Failed to push changes. Check your remote configuration."),
-                    exit_program=True,
+                console.print(
+                    "[red]Failed to push changes. Check your remote configuration and network connection.[/red]"
                 )
+                sys.exit(1)
         except Exception as e:
-            handle_error(
-                GitError(f"Error pushing changes: {e}"),
-                exit_program=True,
-            )
+            console.print(f"[red]Error pushing changes: {e}[/red]")
+            sys.exit(1)
 
     if not quiet:
         logger.info("Successfully committed changes with message:")

{gac-0.16.3.dist-info → gac-0.17.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 0.16.3
+Version: 0.17.2
 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.17.2.dist-info/RECORD

@@ -0,0 +1,20 @@
+gac/__init__.py,sha256=z9yGInqtycFIT3g1ca24r-A3699hKVaRqGUI79wsmMc,415
+gac/__version__.py,sha256=v99UPabTLMGan0nh-8ujsEAomKUPy1bclqTXLNIKfx8,67
+gac/ai.py,sha256=kxZ0UMU_2i9Vb2fXKAUcuFCeZJAZ9G8OSjgTVF06h-Y,5452
+gac/cli.py,sha256=KsagQerqcf2uqGS4HjV_U1AUBtY3DPmYLsTj08riZmE,4545
+gac/config.py,sha256=wSgEDjtis7Vk1pv5VPvYmJyD9-tymDS6GiUHjnCMbIM,1486
+gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
+gac/constants.py,sha256=MAxdASGncfZY1TdKGdhJZ0wvTBEU3gTN6KEdw8n3Bd8,4844
+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=yO17nqu78K4pHj4u9-enVDB2qetR1YWgqK4WBa4pXoM,11597
+gac/preprocess.py,sha256=4igtZ9OTHgTpqwlJmbcGaqzmdD0HHCZJwsZ9eG118Gk,15360
+gac/prompt.py,sha256=i6XPWXCC_v1k2wVkv5FlL540RKG5uS-U6HJU9wC-cGw,18291
+gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
+gac-0.17.2.dist-info/METADATA,sha256=Yx64UZRoaV05ERPcv9-6_UOp4OF3PiiCMg4AdLHlpis,7654
+gac-0.17.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-0.17.2.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-0.17.2.dist-info/licenses/LICENSE,sha256=s11puNmYfzwoSwG96nhOJe268Y1QFckr8-Hmzo3_eJE,1087
+gac-0.17.2.dist-info/RECORD,,

gac-0.16.3.dist-info/RECORD

@@ -1,20 +0,0 @@
-gac/__init__.py,sha256=z9yGInqtycFIT3g1ca24r-A3699hKVaRqGUI79wsmMc,415
-gac/__version__.py,sha256=ZrOgRPcn114KgqOkRlJyqV-9NfDnOY4PEJ2z42L5dj8,67
-gac/ai.py,sha256=kxZ0UMU_2i9Vb2fXKAUcuFCeZJAZ9G8OSjgTVF06h-Y,5452
-gac/cli.py,sha256=UCGaKpGrm8B603V04yMYGkfv9S5-CksSy7zzeqwp13s,4280
-gac/config.py,sha256=7gyD4dDZhb_xL0gjOxfA3cqmz-5LwaMUT3MCTAPBjug,1330
-gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
-gac/constants.py,sha256=7ynwnS6wxT3o7KEed1MZuWrJ9jGf-Yp5aIxRH8P3uwg,4805
-gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
-gac/errors.py,sha256=3vIRMQ2QF3sP9_rPfXAFuu5ZSjIVX4FxM-FAuiR8N-8,7416
-gac/git.py,sha256=csjPf9YzxpYaZjIzIfa0yKTV64q22f718j_Zc9Q9maQ,5725
-gac/init_cli.py,sha256=aNllguofrcLn0ML9tzLVWFkPbwlAvCM9m7undHhMLEo,1825
-gac/main.py,sha256=_BX_B9Denex9MwceT1udBQjzoMLLD2czU8TlHvPRE80,9520
-gac/preprocess.py,sha256=4igtZ9OTHgTpqwlJmbcGaqzmdD0HHCZJwsZ9eG118Gk,15360
-gac/prompt.py,sha256=i6XPWXCC_v1k2wVkv5FlL540RKG5uS-U6HJU9wC-cGw,18291
-gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
-gac-0.16.3.dist-info/METADATA,sha256=TvCN3km323w51BSIuHKLE-PJVAoJU4RcUXeqGBeg_JU,7569
-gac-0.16.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-0.16.3.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-0.16.3.dist-info/licenses/LICENSE,sha256=s11puNmYfzwoSwG96nhOJe268Y1QFckr8-Hmzo3_eJE,1087
-gac-0.16.3.dist-info/RECORD,,