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

gac/__version__.py

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

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

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

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.
 

gac/init_cli.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import click
 import questionary
-from dotenv import set_key
+from dotenv import dotenv_values, set_key
 
 from gac.constants import Languages
 
@@ -27,8 +27,12 @@ def _prompt_required_text(prompt: str) -> str | None:
 def init() -> None:
     """Interactively set up $HOME/.gac.env for gac."""
     click.echo("Welcome to gac initialization!\n")
+
+    # Load existing environment values
+    existing_env = {}
     if GAC_ENV_PATH.exists():
         click.echo(f"$HOME/.gac.env already exists at {GAC_ENV_PATH}. Values will be updated.")
+        existing_env = dict(dotenv_values(str(GAC_ENV_PATH)))
     else:
         GAC_ENV_PATH.touch()
         click.echo(f"Created $HOME/.gac.env at {GAC_ENV_PATH}.")
@@ -130,74 +134,183 @@ def init() -> None:
         set_key(str(GAC_ENV_PATH), "LMSTUDIO_API_URL", url_to_save)
         click.echo(f"Set LMSTUDIO_API_URL={url_to_save}")
 
-    api_key_prompt = "Enter your API key (input hidden, can be set later):"
-    if is_ollama or is_lmstudio:
-        click.echo(
-            "This provider typically runs locally. API keys are optional unless your instance requires authentication."
-        )
-        api_key_prompt = "Enter your API key (optional, press Enter to skip):"
-
-    api_key = questionary.password(api_key_prompt).ask()
-    if api_key:
-        if is_lmstudio:
-            api_key_name = "LMSTUDIO_API_KEY"
-        elif is_zai:
-            api_key_name = "ZAI_API_KEY"
-        elif is_custom_anthropic:
-            api_key_name = "CUSTOM_ANTHROPIC_API_KEY"
-        elif is_custom_openai:
-            api_key_name = "CUSTOM_OPENAI_API_KEY"
+    # Determine API key name based on provider
+    if is_lmstudio:
+        api_key_name = "LMSTUDIO_API_KEY"
+    elif is_zai:
+        api_key_name = "ZAI_API_KEY"
+    elif is_custom_anthropic:
+        api_key_name = "CUSTOM_ANTHROPIC_API_KEY"
+    elif is_custom_openai:
+        api_key_name = "CUSTOM_OPENAI_API_KEY"
+    else:
+        api_key_name = f"{provider_key.upper()}_API_KEY"
+
+    # Check if API key already exists
+    existing_key = existing_env.get(api_key_name)
+
+    if existing_key:
+        # Key exists - offer options
+        click.echo(f"\n{api_key_name} is already configured.")
+        action = questionary.select(
+            "What would you like to do?",
+            choices=[
+                "Keep existing key",
+                "Enter new key",
+            ],
+        ).ask()
+
+        if action is None:
+            click.echo("API key configuration cancelled. Keeping existing key.")
+        elif action.startswith("Keep existing"):
+            click.echo(f"Keeping existing {api_key_name}")
+        elif action.startswith("Enter new"):
+            api_key = questionary.password("Enter your new API key (input hidden):").ask()
+            if api_key and api_key.strip():
+                set_key(str(GAC_ENV_PATH), api_key_name, api_key)
+                click.echo(f"Updated {api_key_name} (hidden)")
+            else:
+                click.echo(f"No key entered. Keeping existing {api_key_name}")
+    else:
+        # No existing key - prompt for new one
+        api_key_prompt = "Enter your API key (input hidden, can be set later):"
+        if is_ollama or is_lmstudio:
+            click.echo(
+                "This provider typically runs locally. API keys are optional unless your instance requires authentication."
+            )
+            api_key_prompt = "Enter your API key (optional, press Enter to skip):"
+
+        api_key = questionary.password(api_key_prompt).ask()
+        if api_key and api_key.strip():
+            set_key(str(GAC_ENV_PATH), api_key_name, api_key)
+            click.echo(f"Set {api_key_name} (hidden)")
+        elif is_ollama or is_lmstudio:
+            click.echo("Skipping API key. You can add one later if needed.")
         else:
-            api_key_name = f"{provider_key.upper()}_API_KEY"
-        set_key(str(GAC_ENV_PATH), api_key_name, api_key)
-        click.echo(f"Set {api_key_name} (hidden)")
-    elif is_ollama or is_lmstudio:
-        click.echo("Skipping API key. You can add one later if needed.")
+            click.echo("No API key entered. You can add one later by editing ~/.gac.env")
 
     # Language selection
     click.echo("\n")
-    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()
-
-    if not language_selection:
-        click.echo("Language selection cancelled. Using English (default).")
-    elif language_selection == "English":
-        click.echo("Set language to English (default)")
-    else:
-        # Handle custom input
-        if language_selection == "Custom":
-            custom_language = questionary.text("Enter the language name (e.g., 'Spanish', 'Français', '日本語'):").ask()
-            if not custom_language or not custom_language.strip():
-                click.echo("No language entered. Using English (default).")
-                language_value = None
+    existing_language = existing_env.get("GAC_LANGUAGE")
+
+    if existing_language:
+        # Language already configured - offer options
+        existing_translate = existing_env.get("GAC_TRANSLATE_PREFIXES", "false")
+        translate_status = "with translated prefixes" if existing_translate == "true" else "with English prefixes"
+        click.echo(f"Language is already configured: {existing_language} ({translate_status})")
+
+        action = questionary.select(
+            "What would you like to do?",
+            choices=[
+                "Keep existing language",
+                "Select new language",
+            ],
+        ).ask()
+
+        if action is None or action.startswith("Keep existing"):
+            if action is None:
+                click.echo("Language configuration cancelled. Keeping existing language.")
             else:
-                language_value = custom_language.strip()
-        else:
-            # Find the English name for the selected language
-            language_value = next(lang[1] for lang in Languages.LANGUAGES if lang[0] == language_selection)
-
-        if language_value:
-            # Ask about prefix translation
-            prefix_choice = questionary.select(
-                "How should conventional commit prefixes be handled?",
-                choices=[
-                    "Keep prefixes in English (feat:, fix:, etc.)",
-                    f"Translate prefixes into {language_value}",
-                ],
+                click.echo(f"Keeping existing language: {existing_language}")
+        elif action.startswith("Select new"):
+            # Proceed with language selection
+            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()
 
-            if not prefix_choice:
-                click.echo("Prefix translation selection cancelled. Using English prefixes.")
-                translate_prefixes = False
+            if not language_selection:
+                click.echo("Language selection cancelled. Keeping existing language.")
+            elif language_selection == "English":
+                set_key(str(GAC_ENV_PATH), "GAC_LANGUAGE", "English")
+                set_key(str(GAC_ENV_PATH), "GAC_TRANSLATE_PREFIXES", "false")
+                click.echo("Set GAC_LANGUAGE=English")
+                click.echo("Set GAC_TRANSLATE_PREFIXES=false")
             else:
-                translate_prefixes = prefix_choice.startswith("Translate prefixes")
+                # Handle custom input
+                if language_selection == "Custom":
+                    custom_language = questionary.text(
+                        "Enter the language name (e.g., 'Spanish', 'Français', '日本語'):"
+                    ).ask()
+                    if not custom_language or not custom_language.strip():
+                        click.echo("No language entered. Keeping existing language.")
+                        language_value = None
+                    else:
+                        language_value = custom_language.strip()
+                else:
+                    # Find the English name for the selected language
+                    language_value = next(lang[1] for lang in Languages.LANGUAGES if lang[0] == language_selection)
+
+                if language_value:
+                    # Ask about prefix translation
+                    prefix_choice = questionary.select(
+                        "How should conventional commit prefixes be handled?",
+                        choices=[
+                            "Keep prefixes in English (feat:, fix:, etc.)",
+                            f"Translate prefixes into {language_value}",
+                        ],
+                    ).ask()
+
+                    if not prefix_choice:
+                        click.echo("Prefix translation selection cancelled. Using English prefixes.")
+                        translate_prefixes = False
+                    else:
+                        translate_prefixes = prefix_choice.startswith("Translate prefixes")
+
+                    # Set the language and prefix translation preference
+                    set_key(str(GAC_ENV_PATH), "GAC_LANGUAGE", language_value)
+                    set_key(str(GAC_ENV_PATH), "GAC_TRANSLATE_PREFIXES", "true" if translate_prefixes else "false")
+                    click.echo(f"Set GAC_LANGUAGE={language_value}")
+                    click.echo(f"Set GAC_TRANSLATE_PREFIXES={'true' if translate_prefixes else 'false'}")
+    else:
+        # No existing language - proceed with normal flow
+        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()
+
+        if not language_selection:
+            click.echo("Language selection cancelled. Using English (default).")
+        elif language_selection == "English":
+            set_key(str(GAC_ENV_PATH), "GAC_LANGUAGE", "English")
+            set_key(str(GAC_ENV_PATH), "GAC_TRANSLATE_PREFIXES", "false")
+            click.echo("Set GAC_LANGUAGE=English")
+            click.echo("Set GAC_TRANSLATE_PREFIXES=false")
+        else:
+            # Handle custom input
+            if language_selection == "Custom":
+                custom_language = questionary.text(
+                    "Enter the language name (e.g., 'Spanish', 'Français', '日本語'):"
+                ).ask()
+                if not custom_language or not custom_language.strip():
+                    click.echo("No language entered. Using English (default).")
+                    language_value = None
+                else:
+                    language_value = custom_language.strip()
+            else:
+                # Find the English name for the selected language
+                language_value = next(lang[1] for lang in Languages.LANGUAGES if lang[0] == language_selection)
+
+            if language_value:
+                # Ask about prefix translation
+                prefix_choice = questionary.select(
+                    "How should conventional commit prefixes be handled?",
+                    choices=[
+                        "Keep prefixes in English (feat:, fix:, etc.)",
+                        f"Translate prefixes into {language_value}",
+                    ],
+                ).ask()
+
+                if not prefix_choice:
+                    click.echo("Prefix translation selection cancelled. Using English prefixes.")
+                    translate_prefixes = False
+                else:
+                    translate_prefixes = prefix_choice.startswith("Translate prefixes")
 
-            # Set the language and prefix translation preference
-            set_key(str(GAC_ENV_PATH), "GAC_LANGUAGE", language_value)
-            set_key(str(GAC_ENV_PATH), "GAC_TRANSLATE_PREFIXES", "true" if translate_prefixes else "false")
-            click.echo(f"Set GAC_LANGUAGE={language_value}")
-            click.echo(f"Set GAC_TRANSLATE_PREFIXES={'true' if translate_prefixes else 'false'}")
+                # Set the language and prefix translation preference
+                set_key(str(GAC_ENV_PATH), "GAC_LANGUAGE", language_value)
+                set_key(str(GAC_ENV_PATH), "GAC_TRANSLATE_PREFIXES", "true" if translate_prefixes else "false")
+                click.echo(f"Set GAC_LANGUAGE={language_value}")
+                click.echo(f"Set GAC_TRANSLATE_PREFIXES={'true' if translate_prefixes else 'false'}")
 
     click.echo(f"\ngac environment setup complete. You can edit {GAC_ENV_PATH} to update values later.")

gac/language_cli.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import click
 import questionary
-from dotenv import set_key, unset_key
+from dotenv import set_key
 
 from gac.constants import Languages
 
@@ -30,14 +30,14 @@ def language() -> None:
         GAC_ENV_PATH.touch()
         click.echo(f"Created {GAC_ENV_PATH}")
 
-    # Handle English (default) - remove the setting
+    # Handle English - set explicitly
     if selection == "English":
-        try:
-            unset_key(str(GAC_ENV_PATH), "GAC_LANGUAGE")
-            click.echo("✓ Set language to English (default)")
-            click.echo(f"  Removed GAC_LANGUAGE from {GAC_ENV_PATH}")
-        except Exception:
-            click.echo("✓ Set language to English (default)")
+        set_key(str(GAC_ENV_PATH), "GAC_LANGUAGE", "English")
+        set_key(str(GAC_ENV_PATH), "GAC_TRANSLATE_PREFIXES", "false")
+        click.echo("✓ Set language to English")
+        click.echo("  GAC_LANGUAGE=English")
+        click.echo("  GAC_TRANSLATE_PREFIXES=false")
+        click.echo(f"\n  Configuration saved to {GAC_ENV_PATH}")
         return
 
     # Handle custom input