gac 2.1.0__tar.gz → 2.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 2.1.0
+Version: 2.2.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
@@ -123,7 +124,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 +147,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
@@ -183,12 +184,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 +203,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.2.0}/README.md

@@ -82,7 +82,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 +105,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
@@ -142,12 +142,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 +161,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.2.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.2.0}/src/gac/__version__.py

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

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

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

{gac-2.1.0 → gac-2.2.0}/src/gac/main.py

@@ -25,6 +25,7 @@ from gac.git import (
 from gac.preprocess import preprocess_diff
 from gac.prompt import build_prompt, clean_commit_message
 from gac.security import get_affected_files, scan_staged_diff
+from gac.utils import edit_commit_message_inplace
 
 logger = logging.getLogger(__name__)
 
@@ -277,7 +278,7 @@ def main(
             if require_confirmation:
                 while True:
                     response = click.prompt(
-                        "Proceed with commit above? [y/n/r/<feedback>]",
+                        "Proceed with commit above? [y/n/r/e/<feedback>]",
                         type=str,
                         show_default=False,
                     ).strip()
@@ -290,6 +291,18 @@ def main(
                         sys.exit(0)
                     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"]:
                         feedback_message = (
                             "Please provide an alternative commit message using the same repository context."

gac-2.2.0/src/gac/utils.py

@@ -0,0 +1,270 @@
+"""Utility functions for gac."""
+
+import logging
+import subprocess
+
+from rich.console import Console
+from rich.theme import Theme
+
+from gac.constants import Logging
+from gac.errors import GacError
+
+
+def setup_logging(
+    log_level: int | str = Logging.DEFAULT_LEVEL,
+    quiet: bool = False,
+    force: bool = False,
+    suppress_noisy: bool = False,
+) -> None:
+    """Configure logging for the application.
+
+    Args:
+        log_level: Log level to use (DEBUG, INFO, WARNING, ERROR)
+        quiet: If True, suppress all output except errors
+        force: If True, force reconfiguration of logging
+        suppress_noisy: If True, suppress noisy third-party loggers
+    """
+    if isinstance(log_level, str):
+        log_level = getattr(logging, log_level.upper(), logging.WARNING)
+
+    if quiet:
+        log_level = logging.ERROR
+
+    kwargs = {"force": force} if force else {}
+
+    logging.basicConfig(
+        level=log_level,
+        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+        **kwargs,  # type: ignore[arg-type]
+    )
+
+    if suppress_noisy:
+        for noisy_logger in ["requests", "urllib3"]:
+            logging.getLogger(noisy_logger).setLevel(logging.WARNING)
+
+    logger.info(f"Logging initialized with level: {logging.getLevelName(log_level)}")
+
+
+theme = Theme(
+    {
+        "success": "green bold",
+        "info": "blue",
+        "warning": "yellow",
+        "error": "red bold",
+        "header": "magenta",
+        "notification": "bright_cyan bold",
+    }
+)
+console = Console(theme=theme)
+logger = logging.getLogger(__name__)
+
+
+def print_message(message: str, level: str = "info") -> None:
+    """Print a styled message with the specified level."""
+    console.print(message, style=level)
+
+
+def run_subprocess(
+    command: list[str],
+    silent: bool = False,
+    timeout: int = 60,
+    check: bool = True,
+    strip_output: bool = True,
+    raise_on_error: bool = True,
+) -> str:
+    """Run a subprocess command safely and return the output.
+
+    Args:
+        command: List of command arguments
+        silent: If True, suppress debug logging
+        timeout: Command timeout in seconds
+        check: Whether to check return code (for compatibility)
+        strip_output: Whether to strip whitespace from output
+        raise_on_error: Whether to raise an exception on error
+
+    Returns:
+        Command output as string
+
+    Raises:
+        GacError: If the command times out
+        subprocess.CalledProcessError: If the command fails and raise_on_error is True
+    """
+    if not silent:
+        logger.debug(f"Running command: {' '.join(command)}")
+
+    try:
+        result = subprocess.run(
+            command,
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=timeout,
+        )
+
+        should_raise = result.returncode != 0 and (check or raise_on_error)
+
+        if should_raise:
+            if not silent:
+                logger.debug(f"Command stderr: {result.stderr}")
+            raise subprocess.CalledProcessError(result.returncode, command, result.stdout, result.stderr)
+
+        output = result.stdout
+        if strip_output:
+            output = output.strip()
+
+        return output
+    except subprocess.TimeoutExpired as e:
+        logger.error(f"Command timed out after {timeout} seconds: {' '.join(command)}")
+        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 e.stderr else str(e)}")
+        if raise_on_error:
+            raise
+        return ""
+    except Exception as e:
+        if not silent:
+            logger.debug(f"Command error: {e}")
+        if raise_on_error:
+            # Convert generic exceptions to CalledProcessError for consistency
+            raise subprocess.CalledProcessError(1, command, "", str(e)) from e
+        return ""
+
+
+def edit_commit_message_inplace(message: str) -> str | None:
+    """Edit commit message in-place using rich terminal editing.
+
+    Uses prompt_toolkit to provide a rich editing experience with:
+    - Multi-line editing
+    - Vi/Emacs key bindings
+    - Line editing capabilities
+    - Esc+Enter or Ctrl+S to submit
+    - Ctrl+C to cancel
+
+    Args:
+        message: The initial commit message
+
+    Returns:
+        The edited commit message, or None if editing was cancelled
+
+    Example:
+        >>> edited = edit_commit_message_inplace("feat: add feature")
+        >>> # User can edit the message using vi/emacs key bindings
+        >>> # Press Esc+Enter or Ctrl+S to submit
+    """
+    from prompt_toolkit import Application
+    from prompt_toolkit.buffer import Buffer
+    from prompt_toolkit.document import Document
+    from prompt_toolkit.enums import EditingMode
+    from prompt_toolkit.key_binding import KeyBindings
+    from prompt_toolkit.layout import HSplit, Layout, Window
+    from prompt_toolkit.layout.controls import BufferControl, FormattedTextControl
+    from prompt_toolkit.layout.margins import ScrollbarMargin
+    from prompt_toolkit.styles import Style
+
+    try:
+        console.print("\n[info]Edit commit message:[/info]")
+        console.print()
+
+        # Create buffer for text editing
+        text_buffer = Buffer(
+            document=Document(text=message, cursor_position=0),
+            multiline=True,
+            enable_history_search=False,
+        )
+
+        # Track submission state
+        cancelled = {"value": False}
+        submitted = {"value": False}
+
+        # Create text editor window
+        text_window = Window(
+            content=BufferControl(
+                buffer=text_buffer,
+                focus_on_click=True,
+            ),
+            height=lambda: max(5, message.count("\n") + 3),
+            wrap_lines=True,
+            right_margins=[ScrollbarMargin()],
+        )
+
+        # Create hint window
+        hint_window = Window(
+            content=FormattedTextControl(
+                text=[("class:hint", " Esc+Enter or Ctrl+S to submit | Ctrl+C to cancel ")],
+            ),
+            height=1,
+            dont_extend_height=True,
+        )
+
+        # Create layout
+        root_container = HSplit(
+            [
+                text_window,
+                hint_window,
+            ]
+        )
+
+        layout = Layout(root_container, focused_element=text_window)
+
+        # Create key bindings
+        kb = KeyBindings()
+
+        @kb.add("c-s")
+        def _(event):
+            """Submit with Ctrl+S."""
+            submitted["value"] = True
+            event.app.exit()
+
+        @kb.add("c-c")
+        def _(event):
+            """Cancel editing."""
+            cancelled["value"] = True
+            event.app.exit()
+
+        @kb.add("escape", "enter")
+        def _(event):
+            """Submit with Esc+Enter."""
+            submitted["value"] = True
+            event.app.exit()
+
+        # Create and run application
+        custom_style = Style.from_dict(
+            {
+                "hint": "#888888",
+            }
+        )
+
+        app: Application[None] = Application(
+            layout=layout,
+            key_bindings=kb,
+            full_screen=False,
+            mouse_support=False,
+            editing_mode=EditingMode.VI,  # Enable vi key bindings
+            style=custom_style,
+        )
+
+        app.run()
+
+        # Handle result
+        if cancelled["value"]:
+            console.print("\n[yellow]Edit cancelled.[/yellow]")
+            return None
+
+        if submitted["value"]:
+            edited_message = text_buffer.text.strip()
+            if not edited_message:
+                console.print("[yellow]Commit message cannot be empty. Edit cancelled.[/yellow]")
+                return None
+            return edited_message
+
+        return None
+
+    except (EOFError, KeyboardInterrupt):
+        console.print("\n[yellow]Edit cancelled.[/yellow]")
+        return None
+    except Exception as e:
+        logger.error(f"Error during in-place editing: {e}")
+        console.print(f"[error]Failed to edit commit message: {e}[/error]")
+        return None

gac-2.1.0/src/gac/utils.py

@@ -1,132 +0,0 @@
-"""Utility functions for gac."""
-
-import logging
-import subprocess
-
-from rich.console import Console
-from rich.theme import Theme
-
-from gac.constants import Logging
-from gac.errors import GacError
-
-
-def setup_logging(
-    log_level: int | str = Logging.DEFAULT_LEVEL,
-    quiet: bool = False,
-    force: bool = False,
-    suppress_noisy: bool = False,
-) -> None:
-    """Configure logging for the application.
-
-    Args:
-        log_level: Log level to use (DEBUG, INFO, WARNING, ERROR)
-        quiet: If True, suppress all output except errors
-        force: If True, force reconfiguration of logging
-        suppress_noisy: If True, suppress noisy third-party loggers
-    """
-    if isinstance(log_level, str):
-        log_level = getattr(logging, log_level.upper(), logging.WARNING)
-
-    if quiet:
-        log_level = logging.ERROR
-
-    kwargs = {"force": force} if force else {}
-
-    logging.basicConfig(
-        level=log_level,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        datefmt="%Y-%m-%d %H:%M:%S",
-        **kwargs,  # type: ignore[arg-type]
-    )
-
-    if suppress_noisy:
-        for noisy_logger in ["requests", "urllib3"]:
-            logging.getLogger(noisy_logger).setLevel(logging.WARNING)
-
-    logger.info(f"Logging initialized with level: {logging.getLevelName(log_level)}")
-
-
-theme = Theme(
-    {
-        "success": "green bold",
-        "info": "blue",
-        "warning": "yellow",
-        "error": "red bold",
-        "header": "magenta",
-        "notification": "bright_cyan bold",
-    }
-)
-console = Console(theme=theme)
-logger = logging.getLogger(__name__)
-
-
-def print_message(message: str, level: str = "info") -> None:
-    """Print a styled message with the specified level."""
-    console.print(message, style=level)
-
-
-def run_subprocess(
-    command: list[str],
-    silent: bool = False,
-    timeout: int = 60,
-    check: bool = True,
-    strip_output: bool = True,
-    raise_on_error: bool = True,
-) -> str:
-    """Run a subprocess command safely and return the output.
-
-    Args:
-        command: List of command arguments
-        silent: If True, suppress debug logging
-        timeout: Command timeout in seconds
-        check: Whether to check return code (for compatibility)
-        strip_output: Whether to strip whitespace from output
-        raise_on_error: Whether to raise an exception on error
-
-    Returns:
-        Command output as string
-
-    Raises:
-        GacError: If the command times out
-        subprocess.CalledProcessError: If the command fails and raise_on_error is True
-    """
-    if not silent:
-        logger.debug(f"Running command: {' '.join(command)}")
-
-    try:
-        result = subprocess.run(
-            command,
-            capture_output=True,
-            text=True,
-            check=False,
-            timeout=timeout,
-        )
-
-        should_raise = result.returncode != 0 and (check or raise_on_error)
-
-        if should_raise:
-            if not silent:
-                logger.debug(f"Command stderr: {result.stderr}")
-            raise subprocess.CalledProcessError(result.returncode, command, result.stdout, result.stderr)
-
-        output = result.stdout
-        if strip_output:
-            output = output.strip()
-
-        return output
-    except subprocess.TimeoutExpired as e:
-        logger.error(f"Command timed out after {timeout} seconds: {' '.join(command)}")
-        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 e.stderr else str(e)}")
-        if raise_on_error:
-            raise
-        return ""
-    except Exception as e:
-        if not silent:
-            logger.debug(f"Command error: {e}")
-        if raise_on_error:
-            # Convert generic exceptions to CalledProcessError for consistency
-            raise subprocess.CalledProcessError(1, command, "", str(e)) from e
-        return ""