gac 2.0.0__tar.gz → 2.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 2.0.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
@@ -52,9 +53,9 @@ Description-Content-Type: text/markdown
 [![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](docs/CONTRIBUTING.md)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-**LLM-powered commit messages that understand your code.**
+**LLM-powered commit messages that understand your code!**
 
-**Tired of writing commit messages?** Replace `git commit -m "..."` with `gac` for contextual, well-formatted commit messages generated by large language models.
+**Automate your commits!** Replace `git commit -m "..."` with `gac` for contextual, well-formatted commit messages generated by large language models!
 
 ---
 
@@ -68,7 +69,7 @@ Intelligent, contextual messages that explain the **why** behind your changes:
 
 ## Quick Start
 
-### Use without installing
+### Use gac without installing
 
 ```bash
 uvx gac init  # Configure your LLM provider
@@ -77,7 +78,7 @@ uvx gac  # Generate and commit with LLM
 
 That's it! Review the generated message and confirm with `y`.
 
-### Install gac globally
+### Install and use gac
 
 ```bash
 uv tool install gac
@@ -85,6 +86,12 @@ gac init
 gac
 ```
 
+### Upgrade installed gac
+
+```bash
+uv tool upgrade gac
+```
+
 ---
 
 ## Key Features
@@ -92,7 +99,7 @@ gac
 ### 🌐 **Supported Providers**
 
 - **Anthropic** • **Cerebras** • **Chutes.ai** • **DeepSeek** • **Fireworks**
-- **Gemini** • **Groq** • **LM Studio** • **MiniMax** • **Ollama** • **OpenAI**
+- **Gemini** • **Groq** • **LM Studio** • **MiniMax** • **Mistral** • **Ollama** • **OpenAI**
 - **OpenRouter** • **Streamlake** • **Synthetic.new** • **Together AI**
 - **Z.AI** • **Z.AI Coding** • **Custom Endpoints (Anthropic/OpenAI)**
 
@@ -117,7 +124,7 @@ 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
 
@@ -140,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
@@ -177,13 +184,18 @@ 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
 
-# Or just type your feedback directly - no prefix needed!
+# 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
 explain the security implications
@@ -191,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.0.0 → gac-2.2.0}/README.md

@@ -11,9 +11,9 @@
 [![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](docs/CONTRIBUTING.md)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-**LLM-powered commit messages that understand your code.**
+**LLM-powered commit messages that understand your code!**
 
-**Tired of writing commit messages?** Replace `git commit -m "..."` with `gac` for contextual, well-formatted commit messages generated by large language models.
+**Automate your commits!** Replace `git commit -m "..."` with `gac` for contextual, well-formatted commit messages generated by large language models!
 
 ---
 
@@ -27,7 +27,7 @@ Intelligent, contextual messages that explain the **why** behind your changes:
 
 ## Quick Start
 
-### Use without installing
+### Use gac without installing
 
 ```bash
 uvx gac init  # Configure your LLM provider
@@ -36,7 +36,7 @@ uvx gac  # Generate and commit with LLM
 
 That's it! Review the generated message and confirm with `y`.
 
-### Install gac globally
+### Install and use gac
 
 ```bash
 uv tool install gac
@@ -44,6 +44,12 @@ gac init
 gac
 ```
 
+### Upgrade installed gac
+
+```bash
+uv tool upgrade gac
+```
+
 ---
 
 ## Key Features
@@ -51,7 +57,7 @@ gac
 ### 🌐 **Supported Providers**
 
 - **Anthropic** • **Cerebras** • **Chutes.ai** • **DeepSeek** • **Fireworks**
-- **Gemini** • **Groq** • **LM Studio** • **MiniMax** • **Ollama** • **OpenAI**
+- **Gemini** • **Groq** • **LM Studio** • **MiniMax** • **Mistral** • **Ollama** • **OpenAI**
 - **OpenRouter** • **Streamlake** • **Synthetic.new** • **Together AI**
 - **Z.AI** • **Z.AI Coding** • **Custom Endpoints (Anthropic/OpenAI)**
 
@@ -76,7 +82,7 @@ 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
 
@@ -99,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
@@ -136,13 +142,18 @@ 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
 
-# Or just type your feedback directly - no prefix needed!
+# 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
 explain the security implications
@@ -150,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.0.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.0.0 → gac-2.2.0}/src/gac/__version__.py

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

{gac-2.0.0 → gac-2.2.0}/src/gac/ai.py

@@ -21,6 +21,7 @@ from gac.providers import (
     call_groq_api,
     call_lmstudio_api,
     call_minimax_api,
+    call_mistral_api,
     call_ollama_api,
     call_openai_api,
     call_openrouter_api,
@@ -94,6 +95,7 @@ def generate_commit_message(
         "groq": call_groq_api,
         "lm-studio": call_lmstudio_api,
         "minimax": call_minimax_api,
+        "mistral": call_mistral_api,
         "ollama": call_ollama_api,
         "openai": call_openai_api,
         "openrouter": call_openrouter_api,

{gac-2.0.0 → gac-2.2.0}/src/gac/ai_utils.py

@@ -102,6 +102,7 @@ def generate_with_retries(
         "groq",
         "lm-studio",
         "minimax",
+        "mistral",
         "ollama",
         "openai",
         "openrouter",

{gac-2.0.0 → gac-2.2.0}/src/gac/cli.py

@@ -154,5 +154,15 @@ cli.add_command(init_cli)
 cli.add_command(language_cli)
 cli.add_command(diff_cli)
 
+
+@click.command(context_settings=language_cli.context_settings)
+@click.pass_context
+def lang(ctx):
+    """Set the language for commit messages interactively. (Alias for 'language')"""
+    ctx.forward(language_cli)
+
+
+cli.add_command(lang)  # Add the lang alias
+
 if __name__ == "__main__":
     cli()

{gac-2.0.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
@@ -214,6 +214,37 @@ class Languages:
         "fi": "Finnish",
     }
 
+    # List of languages with display names and English names for CLI selection
+    # Format: (display_name, english_name)
+    LANGUAGES: list[tuple[str, str]] = [
+        ("English", "English"),
+        ("简体中文", "Simplified Chinese"),
+        ("繁體中文", "Traditional Chinese"),
+        ("日本語", "Japanese"),
+        ("한국어", "Korean"),
+        ("Español", "Spanish"),
+        ("Português", "Portuguese"),
+        ("Français", "French"),
+        ("Deutsch", "German"),
+        ("Русский", "Russian"),
+        ("हिन्दी", "Hindi"),
+        ("Italiano", "Italian"),
+        ("Polski", "Polish"),
+        ("Türkçe", "Turkish"),
+        ("Nederlands", "Dutch"),
+        ("Tiếng Việt", "Vietnamese"),
+        ("ไทย", "Thai"),
+        ("Bahasa Indonesia", "Indonesian"),
+        ("Svenska", "Swedish"),
+        ("العربية", "Arabic"),
+        ("עברית", "Hebrew"),
+        ("Ελληνικά", "Greek"),
+        ("Dansk", "Danish"),
+        ("Norsk", "Norwegian"),
+        ("Suomi", "Finnish"),
+        ("Custom", "Custom"),
+    ]
+
     @staticmethod
     def resolve_code(language: str) -> str:
         """Resolve a language code to its full name.

{gac-2.0.0 → gac-2.2.0}/src/gac/init_cli.py

@@ -6,6 +6,8 @@ import click
 import questionary
 from dotenv import set_key
 
+from gac.constants import Languages
+
 GAC_ENV_PATH = Path.home() / ".gac.env"
 
 
@@ -33,7 +35,7 @@ def init() -> None:
 
     providers = [
         ("Anthropic", "claude-haiku-4-5"),
-        ("Cerebras", "qwen-3-coder-480b"),
+        ("Cerebras", "zai-glm-4.6"),
         ("Chutes", "zai-org/GLM-4.6-FP8"),
         ("Custom (Anthropic)", ""),
         ("Custom (OpenAI)", ""),
@@ -43,6 +45,7 @@ def init() -> None:
         ("Groq", "meta-llama/llama-4-maverick-17b-128e-instruct"),
         ("LM Studio", "gemma3"),
         ("MiniMax", "MiniMax-M2"),
+        ("Mistral", "mistral-small-latest"),
         ("Ollama", "gemma3"),
         ("OpenAI", "gpt-4.1-mini"),
         ("OpenRouter", "openrouter/auto"),
@@ -153,36 +156,7 @@ def init() -> None:
 
     # Language selection
     click.echo("\n")
-    languages = [
-        ("English", "English"),
-        ("简体中文", "Simplified Chinese"),
-        ("繁體中文", "Traditional Chinese"),
-        ("日本語", "Japanese"),
-        ("한국어", "Korean"),
-        ("Español", "Spanish"),
-        ("Português", "Portuguese"),
-        ("Français", "French"),
-        ("Deutsch", "German"),
-        ("Русский", "Russian"),
-        ("हिन्दी", "Hindi"),
-        ("Italiano", "Italian"),
-        ("Polski", "Polish"),
-        ("Türkçe", "Turkish"),
-        ("Nederlands", "Dutch"),
-        ("Tiếng Việt", "Vietnamese"),
-        ("ไทย", "Thai"),
-        ("Bahasa Indonesia", "Indonesian"),
-        ("Svenska", "Swedish"),
-        ("العربية", "Arabic"),
-        ("עברית", "Hebrew"),
-        ("Ελληνικά", "Greek"),
-        ("Dansk", "Danish"),
-        ("Norsk", "Norwegian"),
-        ("Suomi", "Finnish"),
-        ("Custom", "Custom"),
-    ]
-
-    display_names = [lang[0] for lang in languages]
+    display_names = [lang[0] for lang in Languages.LANGUAGES]
     language_selection = questionary.select(
         "Select a language for commit messages:", choices=display_names, use_shortcuts=True, use_arrow_keys=True
     ).ask()
@@ -202,7 +176,7 @@ def init() -> None:
                 language_value = custom_language.strip()
         else:
             # Find the English name for the selected language
-            language_value = next(lang[1] for lang in languages if lang[0] == language_selection)
+            language_value = next(lang[1] for lang in Languages.LANGUAGES if lang[0] == language_selection)
 
         if language_value:
             # Ask about prefix translation

{gac-2.0.0 → gac-2.2.0}/src/gac/language_cli.py

@@ -6,6 +6,8 @@ import click
 import questionary
 from dotenv import set_key, unset_key
 
+from gac.constants import Languages
+
 GAC_ENV_PATH = Path.home() / ".gac.env"
 
 
@@ -14,38 +16,7 @@ def language() -> None:
     """Set the language for commit messages interactively."""
     click.echo("Select a language for your commit messages:\n")
 
-    # Languages sorted by programmer population likelihood
-    # Based on GitHub statistics and global developer demographics
-    languages = [
-        ("English", "English"),
-        ("简体中文", "Simplified Chinese"),
-        ("繁體中文", "Traditional Chinese"),
-        ("日本語", "Japanese"),
-        ("한국어", "Korean"),
-        ("Español", "Spanish"),
-        ("Português", "Portuguese"),
-        ("Français", "French"),
-        ("Deutsch", "German"),
-        ("Русский", "Russian"),
-        ("हिन्दी", "Hindi"),
-        ("Italiano", "Italian"),
-        ("Polski", "Polish"),
-        ("Türkçe", "Turkish"),
-        ("Nederlands", "Dutch"),
-        ("Tiếng Việt", "Vietnamese"),
-        ("ไทย", "Thai"),
-        ("Bahasa Indonesia", "Indonesian"),
-        ("Svenska", "Swedish"),
-        ("العربية", "Arabic"),
-        ("עברית", "Hebrew"),
-        ("Ελληνικά", "Greek"),
-        ("Dansk", "Danish"),
-        ("Norsk", "Norwegian"),
-        ("Suomi", "Finnish"),
-        ("Custom", "Custom"),
-    ]
-
-    display_names = [lang[0] for lang in languages]
+    display_names = [lang[0] for lang in Languages.LANGUAGES]
     selection = questionary.select(
         "Choose your language:", choices=display_names, use_shortcuts=True, use_arrow_keys=True
     ).ask()
@@ -78,7 +49,7 @@ def language() -> None:
         language_value = custom_language.strip()
     else:
         # Find the English name for the selected language
-        language_value = next(lang[1] for lang in languages if lang[0] == selection)
+        language_value = next(lang[1] for lang in Languages.LANGUAGES if lang[0] == selection)
 
     # Ask about prefix translation
     click.echo()  # Blank line for spacing

{gac-2.0.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.0.0 → gac-2.2.0}/src/gac/providers/__init__.py

@@ -11,6 +11,7 @@ from .gemini import call_gemini_api
 from .groq import call_groq_api
 from .lmstudio import call_lmstudio_api
 from .minimax import call_minimax_api
+from .mistral import call_mistral_api
 from .ollama import call_ollama_api
 from .openai import call_openai_api
 from .openrouter import call_openrouter_api
@@ -31,6 +32,7 @@ __all__ = [
     "call_groq_api",
     "call_lmstudio_api",
     "call_minimax_api",
+    "call_mistral_api",
     "call_ollama_api",
     "call_openai_api",
     "call_openrouter_api",

gac-2.2.0/src/gac/providers/mistral.py

@@ -0,0 +1,38 @@
+"""Mistral API provider for gac."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+def call_mistral_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Mistral API directly."""
+    api_key = os.getenv("MISTRAL_API_KEY")
+    if not api_key:
+        raise AIError.authentication_error("MISTRAL_API_KEY not found in environment variables")
+
+    url = "https://api.mistral.ai/v1/chat/completions"
+    headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+
+    data = {"model": model, "messages": messages, "temperature": temperature, "max_tokens": max_tokens}
+
+    try:
+        response = httpx.post(url, headers=headers, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+        content = response_data["choices"][0]["message"]["content"]
+        if content is None:
+            raise AIError.model_error("Mistral API returned null content")
+        if content == "":
+            raise AIError.model_error("Mistral API returned empty content")
+        return content
+    except httpx.HTTPStatusError as e:
+        if e.response.status_code == 429:
+            raise AIError.rate_limit_error(f"Mistral API rate limit exceeded: {e.response.text}") from e
+        raise AIError.model_error(f"Mistral API error: {e.response.status_code} - {e.response.text}") from e
+    except httpx.TimeoutException as e:
+        raise AIError.timeout_error(f"Mistral API request timed out: {str(e)}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling Mistral API: {str(e)}") from e

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.0.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 ""