gac 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

gac/__version__.py

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

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/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/utils.py

@@ -130,3 +130,141 @@ def run_subprocess(
             # 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.dist-info → gac-2.2.0.dist-info}/METADATA

@@ -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.dist-info → gac-2.2.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
 gac/__init__.py,sha256=z9yGInqtycFIT3g1ca24r-A3699hKVaRqGUI79wsmMc,415
-gac/__version__.py,sha256=bTn7Tm6xpc6WrZ2ANt-S3NGI6Rng6eG5VxYTYs-UWqM,66
+gac/__version__.py,sha256=r4l_6jWyV87srDy0RVRKwXgzwJscJzmR4SM825CjGh0,66
 gac/ai.py,sha256=iBHeLsqe6iyFj86wbvEosyy4vkjAN1BlLQeqtb_rfmo,4303
 gac/ai_utils.py,sha256=094ujZVlbDnHM3HPxiBSCbGi_5MD6bOKCj2SjKVDDK0,7445
 gac/cli.py,sha256=SOrSfrlku99O7O8zev5hRVmADAmJ7AIkM7Z0dquuCbQ,5807
 gac/config.py,sha256=O9n09-sFOqlkf47vieEP7fI5I7uhu1cXn9PUZ5yiYkw,1974
 gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
-gac/constants.py,sha256=Spuqa1ntae0CtNGu-Emxzc_Zz1CipikO3h5BWcUlUW0,9586
+gac/constants.py,sha256=zgylsiKnpBunoNzVT6RpAVe9m8cgxZrZ55kRN6ZP_cM,9586
 gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
 gac/errors.py,sha256=ysDIVRCd0YQVTOW3Q6YzdolxCdtkoQCAFf3_jrqbjUY,7916
 gac/git.py,sha256=g6tvph50zV-wrTWrxARYXEpl0NeI8-ffFwHoqhp3fSE,8033
 gac/init_cli.py,sha256=KvFOvjjyMpdJ3MhJFvXSuYjdfulPA6hCP11YXwjHrqw,8849
 gac/language_cli.py,sha256=J4xZNNrMvHamsjK4TCsOVj0lrjYDtLMuHlnTqN0-N_w,3024
-gac/main.py,sha256=LJhONOP_w09TE7HOd4T_NiAzmiqemY2N7EZ6biqwVQE,15221
+gac/main.py,sha256=fK48fGHeJ4qGsttbKDoMXs4Gj3NncFHz_F_cJZI70IQ,16159
 gac/preprocess.py,sha256=hk2p2X4-xVDvuy-T1VMzMa9k5fTUbhlWDyw89DCf81Q,15379
 gac/prompt.py,sha256=HLvsW3YQLdTfw2N9UgjZ0jWckUc1x76V7Kcqjcl8Fsk,28633
 gac/security.py,sha256=15Yp6YR8QC4eECJi1BUCkMteh_veZXUbLL6W8qGcDm4,9920
-gac/utils.py,sha256=nV42-brIHW_fBg7x855GM8nRrqEBbRzTSweg-GTyGE8,3971
+gac/utils.py,sha256=owkUzwJBX8mi0VrP3HKxku5vJj_JlaShzTYwjjsHn-4,8126
 gac/providers/__init__.py,sha256=pT1xcKoZkPm6BWaxcAQ299-Ca5zZ31kf4DeQYAim9Tw,1367
 gac/providers/anthropic.py,sha256=VK5d1s1PmBNDwh_x7illQ2CIZIHNIYU28btVfizwQPs,2036
 gac/providers/cerebras.py,sha256=Ik8lhlsliGJVkgDgqlThfpra9tqbdYQZkaC4eNxRd9w,1648
@@ -36,8 +36,8 @@ gac/providers/streamlake.py,sha256=KAA2ZnpuEI5imzvdWVWUhEBHSP0BMnprKXte6CbwBWY,2
 gac/providers/synthetic.py,sha256=sRMIJTS9LpcXd9A7qp_ZjZxdqtTKRn9fl1W4YwJZP4c,1855
 gac/providers/together.py,sha256=1bUIVHfYzcEDw4hQPE8qV6hjc2JNHPv_khVgpk2IJxI,1667
 gac/providers/zai.py,sha256=kywhhrCfPBu0rElZyb-iENxQxxpVGykvePuL4xrXlaU,2739
-gac-2.1.0.dist-info/METADATA,sha256=VYrOHxHKI_6jbenHBBKt3F8IfBNf-n4Vlnf_LUYBuGM,8958
-gac-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-2.1.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-2.1.0.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
-gac-2.1.0.dist-info/RECORD,,
+gac-2.2.0.dist-info/METADATA,sha256=Z5Vv7oBzqWKVr7lDmk_HFjq3kF13DNnCkMnXKZDKRtA,9609
+gac-2.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-2.2.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-2.2.0.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
+gac-2.2.0.dist-info/RECORD,,