gac 2.1.0__tar.gz → 2.3.0__tar.gz

{gac-2.1.0 → gac-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 2.1.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
@@ -25,6 +25,7 @@ Requires-Dist: click>=8.3.0
 Requires-Dist: halo
 Requires-Dist: httpcore>=1.0.9
 Requires-Dist: httpx>=0.28.0
+Requires-Dist: prompt-toolkit>=3.0.36
 Requires-Dist: pydantic>=2.12.0
 Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: questionary
@@ -107,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**
 
@@ -123,7 +125,7 @@ uv tool upgrade gac
 
 ### 💻 **Developer Experience**
 
-- **Interactive feedback**: Type `r` to reroll, or directly type your feedback like `make it shorter` or `focus on the bug fix`
+- **Interactive feedback**: Type `r` to reroll, `e` to edit in-place with vi/emacs keybindings, or directly type your feedback like `make it shorter` or `focus on the bug fix`
 - **One-command workflows**: Complete workflows with flags like `gac -ayp` (stage all, auto-confirm, push)
 - **Git integration**: Respects pre-commit and lefthook hooks, running them before expensive LLM operations
 
@@ -146,7 +148,7 @@ git add .
 # Generate and commit with LLM
 gac
 
-# Review → y (commit) | n (cancel) | r (reroll) | or type feedback
+# Review → y (commit) | n (cancel) | r (reroll) | e (edit) | or type feedback
 ```
 
 ### Common Commands
@@ -174,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
 
@@ -183,12 +188,17 @@ gac --skip-secret-scan
 
 ### Interactive Feedback System
 
-Not happy with the result? You have two options:
+Not happy with the result? You have several options:
 
 ```bash
 # Simple reroll (no feedback)
 r
 
+# Edit in-place with rich terminal editing
+e
+# Uses prompt_toolkit for multi-line editing with vi/emacs keybindings
+# Press Esc+Enter or Ctrl+S to submit, Ctrl+C to cancel
+
 # Or just type your feedback directly!
 make it shorter and focus on the performance improvement
 use conventional commit format with scope
@@ -197,6 +207,13 @@ explain the security implications
 # Press Enter on empty input to see the prompt again
 ```
 
+The edit feature (`e`) provides rich in-place terminal editing, allowing you to:
+
+- **Edit naturally**: Multi-line editing with familiar vi/emacs key bindings
+- **Make quick fixes**: Correct typos, adjust wording, or refine formatting
+- **Add details**: Include information the LLM might have missed
+- **Restructure**: Reorganize bullet points or change the message structure
+
 ---
 
 ## Configuration

{gac-2.1.0 → gac-2.3.0}/README.md

@@ -66,6 +66,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**
 
@@ -82,7 +83,7 @@ uv tool upgrade gac
 
 ### 💻 **Developer Experience**
 
-- **Interactive feedback**: Type `r` to reroll, or directly type your feedback like `make it shorter` or `focus on the bug fix`
+- **Interactive feedback**: Type `r` to reroll, `e` to edit in-place with vi/emacs keybindings, or directly type your feedback like `make it shorter` or `focus on the bug fix`
 - **One-command workflows**: Complete workflows with flags like `gac -ayp` (stage all, auto-confirm, push)
 - **Git integration**: Respects pre-commit and lefthook hooks, running them before expensive LLM operations
 
@@ -105,7 +106,7 @@ git add .
 # Generate and commit with LLM
 gac
 
-# Review → y (commit) | n (cancel) | r (reroll) | or type feedback
+# Review → y (commit) | n (cancel) | r (reroll) | e (edit) | or type feedback
 ```
 
 ### Common Commands
@@ -133,6 +134,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
 
@@ -142,12 +146,17 @@ gac --skip-secret-scan
 
 ### Interactive Feedback System
 
-Not happy with the result? You have two options:
+Not happy with the result? You have several options:
 
 ```bash
 # Simple reroll (no feedback)
 r
 
+# Edit in-place with rich terminal editing
+e
+# Uses prompt_toolkit for multi-line editing with vi/emacs keybindings
+# Press Esc+Enter or Ctrl+S to submit, Ctrl+C to cancel
+
 # Or just type your feedback directly!
 make it shorter and focus on the performance improvement
 use conventional commit format with scope
@@ -156,6 +165,13 @@ explain the security implications
 # Press Enter on empty input to see the prompt again
 ```
 
+The edit feature (`e`) provides rich in-place terminal editing, allowing you to:
+
+- **Edit naturally**: Multi-line editing with familiar vi/emacs key bindings
+- **Make quick fixes**: Correct typos, adjust wording, or refine formatting
+- **Add details**: Include information the LLM might have missed
+- **Restructure**: Reorganize bullet points or change the message structure
+
 ---
 
 ## Configuration

{gac-2.1.0 → gac-2.3.0}/pyproject.toml

@@ -41,6 +41,7 @@ dependencies = [
     "halo",
     "questionary",
     "rich>=14.1.0",
+    "prompt_toolkit>=3.0.36",
 
 ]
 

{gac-2.1.0 → gac-2.3.0}/src/gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "2.1.0"
+__version__ = "2.3.0"

{gac-2.1.0 → gac-2.3.0}/src/gac/ai.py

@@ -42,6 +42,8 @@ def generate_commit_message(
     max_tokens: int = EnvDefaults.MAX_OUTPUT_TOKENS,
     max_retries: int = EnvDefaults.MAX_RETRIES,
     quiet: bool = False,
+    is_group: bool = False,
+    skip_success_message: bool = False,
 ) -> str:
     """Generate a commit message using direct API calls to AI providers.
 
@@ -116,6 +118,8 @@ def generate_commit_message(
             max_tokens=max_tokens,
             max_retries=max_retries,
             quiet=quiet,
+            is_group=is_group,
+            skip_success_message=skip_success_message,
         )
     except AIError:
         # Re-raise AIError exceptions as-is to preserve error classification
@@ -123,3 +127,25 @@ def generate_commit_message(
     except Exception as e:
         logger.error(f"Failed to generate commit message: {e}")
         raise AIError.model_error(f"Failed to generate commit message: {e}") from e
+
+
+def generate_grouped_commits(
+    model: str,
+    prompt: list[dict[str, str]],
+    temperature: float,
+    max_tokens: int,
+    max_retries: int,
+    quiet: bool = False,
+    skip_success_message: bool = False,
+) -> str:
+    """Generate grouped commits JSON response."""
+    return generate_commit_message(
+        model=model,
+        prompt=prompt,
+        temperature=temperature,
+        max_tokens=max_tokens,
+        max_retries=max_retries,
+        quiet=quiet,
+        is_group=True,
+        skip_success_message=skip_success_message,
+    )

{gac-2.1.0 → gac-2.3.0}/src/gac/ai_utils.py

@@ -83,6 +83,8 @@ def generate_with_retries(
     max_tokens: int,
     max_retries: int,
     quiet: bool = False,
+    is_group: bool = False,
+    skip_success_message: bool = False,
 ) -> str:
     """Generate content with retry logic using direct API calls."""
     # Parse model string to determine provider and actual model
@@ -121,10 +123,11 @@ def generate_with_retries(
         raise AIError.model_error("No messages provided for AI generation")
 
     # Set up spinner
+    message_type = "commit messages" if is_group else "commit message"
     if quiet:
         spinner = None
     else:
-        spinner = Halo(text=f"Generating commit message with {provider} {model_name}...", spinner="dots")
+        spinner = Halo(text=f"Generating {message_type} with {provider} {model_name}...", spinner="dots")
         spinner.start()
 
     last_exception = None
@@ -132,7 +135,7 @@ def generate_with_retries(
 
     for attempt in range(max_retries):
         try:
-            if not quiet and attempt > 0:
+            if not quiet and not skip_success_message and attempt > 0:
                 if spinner:
                     spinner.text = f"Retry {attempt + 1}/{max_retries} with {provider} {model_name}..."
                 logger.info(f"Retry attempt {attempt + 1}/{max_retries}")
@@ -145,7 +148,10 @@ def generate_with_retries(
             content = provider_func(model=model_name, messages=messages, temperature=temperature, max_tokens=max_tokens)
 
             if spinner:
-                spinner.succeed(f"Generated commit message with {provider} {model_name}")
+                if skip_success_message:
+                    spinner.stop()  # Stop spinner without showing success/failure
+                else:
+                    spinner.succeed(f"Generated {message_type} with {provider} {model_name}")
 
             if content is not None and content.strip():
                 return content.strip()  # type: ignore[no-any-return]
@@ -160,8 +166,8 @@ def generate_with_retries(
 
             # For authentication and model errors, don't retry
             if error_type in ["authentication", "model"]:
-                if spinner:
-                    spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
+                if spinner and not skip_success_message:
+                    spinner.fail(f"Failed to generate {message_type} with {provider} {model_name}")
 
                 # Create the appropriate error type based on classification
                 if error_type == "authentication":
@@ -172,23 +178,32 @@ def generate_with_retries(
             if attempt < max_retries - 1:
                 # Exponential backoff
                 wait_time = 2**attempt
-                if not quiet:
-                    logger.warning(f"AI generation failed (attempt {attempt + 1}), retrying in {wait_time}s: {str(e)}")
-
-                if spinner:
+                if not quiet and not skip_success_message:
+                    if attempt == 0:
+                        logger.warning(f"AI generation failed, retrying in {wait_time}s: {str(e)}")
+                    else:
+                        logger.warning(
+                            f"AI generation failed (attempt {attempt + 1}), retrying in {wait_time}s: {str(e)}"
+                        )
+
+                if spinner and not skip_success_message:
                     for i in range(wait_time, 0, -1):
                         spinner.text = f"Retry {attempt + 1}/{max_retries} in {i}s..."
                         time.sleep(1)
                 else:
                     time.sleep(wait_time)
             else:
-                logger.error(f"AI generation failed after {max_retries} attempts: {str(e)}")
+                num_retries = max_retries
+                retry_word = "retry" if num_retries == 1 else "retries"
+                logger.error(f"AI generation failed after {num_retries} {retry_word}: {str(e)}")
 
-    if spinner:
-        spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
+    if spinner and not skip_success_message:
+        spinner.fail(f"Failed to generate {message_type} with {provider} {model_name}")
 
     # If we get here, all retries failed - use the last classified error type
-    error_message = f"Failed to generate commit message after {max_retries} attempts"
+    num_retries = max_retries
+    retry_word = "retry" if num_retries == 1 else "retries"
+    error_message = f"Failed to generate {message_type} after {num_retries} {retry_word}"
     if last_error_type == "authentication":
         raise AIError.authentication_error(error_message) from last_exception
     elif last_error_type == "rate_limit":

{gac-2.1.0 → gac-2.3.0}/src/gac/cli.py

@@ -28,6 +28,7 @@ logger = logging.getLogger(__name__)
 @click.group(invoke_without_command=True, context_settings={"ignore_unknown_options": True})
 # Git workflow options
 @click.option("--add-all", "-a", is_flag=True, help="Stage all changes before committing")
+@click.option("--group", "-g", is_flag=True, help="Group changes into multiple logical commits")
 @click.option("--push", "-p", is_flag=True, help="Push changes to remote after committing")
 @click.option("--dry-run", is_flag=True, help="Dry run the commit workflow")
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompt")
@@ -70,6 +71,7 @@ logger = logging.getLogger(__name__)
 def cli(
     ctx: click.Context,
     add_all: bool = False,
+    group: bool = False,
     log_level: str = str(config["log_level"]),
     one_liner: bool = False,
     push: bool = False,
@@ -109,6 +111,7 @@ def cli(
         try:
             main(
                 stage_all=add_all,
+                group=group,
                 model=model,
                 hint=hint,
                 one_liner=one_liner,
@@ -131,6 +134,7 @@ def cli(
 
         ctx.obj = {
             "add_all": add_all,
+            "group": group,
             "log_level": log_level,
             "one_liner": one_liner,
             "push": push,

{gac-2.1.0 → gac-2.3.0}/src/gac/constants.py

@@ -20,8 +20,8 @@ class EnvDefaults:
 
     MAX_RETRIES: int = 3
     TEMPERATURE: float = 1
-    MAX_OUTPUT_TOKENS: int = 1024  # includes reasoning tokens
-    WARNING_LIMIT_TOKENS: int = 16384
+    MAX_OUTPUT_TOKENS: int = 4096  # includes reasoning tokens
+    WARNING_LIMIT_TOKENS: int = 32768
     ALWAYS_INCLUDE_SCOPE: bool = False
     SKIP_SECRET_SCAN: bool = False
     VERBOSE: bool = False

{gac-2.1.0 → gac-2.3.0}/src/gac/git.py

@@ -50,6 +50,48 @@ def get_staged_files(file_type: str | None = None, existing_only: bool = False)
         return []
 
 
+def get_staged_status() -> str:
+    """Get formatted status of staged files only, excluding unstaged/untracked files.
+
+    Returns:
+        Formatted status string with M/A/D/R indicators
+    """
+    try:
+        output = run_git_command(["diff", "--name-status", "--staged"])
+        if not output:
+            return "No changes staged for commit."
+
+        status_map = {
+            "M": "modified",
+            "A": "new file",
+            "D": "deleted",
+            "R": "renamed",
+            "C": "copied",
+            "T": "typechange",
+        }
+
+        status_lines = ["Changes to be committed:"]
+        for line in output.splitlines():
+            line = line.strip()
+            if not line:
+                continue
+
+            # Parse status line (e.g., "M\tfile.py" or "R100\told.py\tnew.py")
+            parts = line.split("\t")
+            if len(parts) < 2:
+                continue
+
+            change_type = parts[0][0]  # First char is the status (M, A, D, R, etc.)
+            file_path = parts[-1]  # Last part is the new/current file path
+
+            status_label = status_map.get(change_type, "modified")
+            status_lines.append(f"\t{status_label}:   {file_path}")
+
+        return "\n".join(status_lines)
+    except GitError:
+        return "No changes staged for commit."
+
+
 def get_diff(staged: bool = True, color: bool = True, commit1: str | None = None, commit2: str | None = None) -> str:
     """Get the diff between commits or working tree.