gac 1.13.0__py3-none-any.whl → 3.6.0__py3-none-any.whl

gac/main.py

@@ -16,7 +16,9 @@ from gac.config import load_config
 from gac.constants import EnvDefaults, Utility
 from gac.errors import AIError, GitError, handle_error
 from gac.git import (
+    detect_rename_mappings,
     get_staged_files,
+    get_staged_status,
     push_changes,
     run_git_command,
     run_lefthook_hooks,
@@ -25,6 +27,15 @@ 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.workflow_utils import (
+    check_token_warning,
+    collect_interactive_answers,
+    display_commit_message,
+    execute_commit,
+    format_answers_for_prompt,
+    handle_confirmation_loop,
+    restore_staging,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -32,8 +43,699 @@ config = load_config()
 console = Console()  # Initialize console globally to prevent undefined access
 
 
+def _validate_grouped_files_or_feedback(staged: set[str], grouped_result: dict) -> tuple[bool, str, str]:
+    from collections import Counter
+
+    commits = grouped_result.get("commits", []) if isinstance(grouped_result, dict) else []
+    all_files: list[str] = []
+    for commit in commits:
+        files = commit.get("files", []) if isinstance(commit, dict) else []
+        all_files.extend([str(p) for p in files])
+
+    counts = Counter(all_files)
+    union_set = set(all_files)
+
+    duplicates = sorted([f for f, c in counts.items() if c > 1])
+    missing = sorted(staged - union_set)
+    unexpected = sorted(union_set - staged)
+
+    if not duplicates and not missing and not unexpected:
+        return True, "", ""
+
+    problems: list[str] = []
+    if missing:
+        problems.append(f"Missing: {', '.join(missing)}")
+    if unexpected:
+        problems.append(f"Not staged: {', '.join(unexpected)}")
+    if duplicates:
+        problems.append(f"Duplicates: {', '.join(duplicates)}")
+
+    feedback = f"{'; '.join(problems)}. Required files: {', '.join(sorted(staged))}. Respond with ONLY valid JSON."
+    return False, feedback, "; ".join(problems)
+
+
+def _parse_model_identifier(model: str) -> tuple[str, str]:
+    """Validate and split model identifier into provider and model name."""
+    normalized = model.strip()
+    if ":" not in normalized:
+        message = (
+            f"Invalid model format: '{model}'. Expected 'provider:model', e.g. 'openai:gpt-4o-mini'. "
+            "Use 'gac config set model <provider:model>' to update your configuration."
+        )
+        logger.error(message)
+        console.print(f"[red]{message}[/red]")
+        sys.exit(1)
+
+    provider, model_name = normalized.split(":", 1)
+    if not provider or not model_name:
+        message = (
+            f"Invalid model format: '{model}'. Both provider and model name are required "
+            "(example: 'anthropic:claude-haiku-4-5')."
+        )
+        logger.error(message)
+        console.print(f"[red]{message}[/red]")
+        sys.exit(1)
+
+    return provider, model_name
+
+
+def _handle_validation_retry(
+    attempts: int,
+    content_retry_budget: int,
+    raw_response: str,
+    feedback_message: str,
+    error_message: str,
+    conversation_messages: list[dict[str, str]],
+    quiet: bool,
+    retry_context: str,
+) -> bool:
+    """Handle validation retry logic. Returns True if should exit, False if should retry."""
+    conversation_messages.append({"role": "assistant", "content": raw_response})
+    conversation_messages.append({"role": "user", "content": feedback_message})
+    if attempts >= content_retry_budget:
+        logger.error(error_message)
+        console.print(f"\n[red]{error_message}[/red]")
+        console.print("\n[yellow]Raw model output:[/yellow]")
+        console.print(Panel(raw_response, title="Model Output", border_style="yellow"))
+        return True
+    if not quiet:
+        console.print(f"[yellow]Retry {attempts} of {content_retry_budget - 1}: {retry_context}[/yellow]")
+    return False
+
+
+def execute_grouped_commits_workflow(
+    *,
+    system_prompt: str,
+    user_prompt: str,
+    model: str,
+    temperature: float,
+    max_output_tokens: int,
+    max_retries: int,
+    require_confirmation: bool,
+    quiet: bool,
+    no_verify: bool,
+    dry_run: bool,
+    push: bool,
+    show_prompt: bool,
+    interactive: bool,
+    message_only: bool,
+    hook_timeout: int = 120,
+) -> None:
+    """Execute the grouped commits workflow."""
+    import json
+
+    from gac.ai import generate_grouped_commits
+
+    provider, model_name = _parse_model_identifier(model)
+
+    if show_prompt:
+        full_prompt = f"SYSTEM PROMPT:\n{system_prompt}\n\nUSER PROMPT:\n{user_prompt}"
+        console.print(Panel(full_prompt, title="Prompt for LLM", border_style="bright_blue"))
+
+    conversation_messages: list[dict[str, str]] = []
+    if system_prompt:
+        conversation_messages.append({"role": "system", "content": system_prompt})
+    conversation_messages.append({"role": "user", "content": user_prompt})
+
+    _parse_model_identifier(model)
+
+    # Generate interactive questions if enabled
+    if interactive and not message_only:
+        try:
+            # Extract git data from the user prompt for question generation
+            status_match = None
+            diff_match = None
+            diff_stat_match = None
+
+            import re
+
+            status_match = re.search(r"<git_status>\n(.*?)\n</git_status>", user_prompt, re.DOTALL)
+            diff_match = re.search(r"<git_diff>\n(.*?)\n</git_diff>", user_prompt, re.DOTALL)
+            diff_stat_match = re.search(r"<git_diff_stat>\n(.*?)\n</git_diff_stat>", user_prompt, re.DOTALL)
+
+            status = status_match.group(1) if status_match else ""
+            diff = diff_match.group(1) if diff_match else ""
+            diff_stat = diff_stat_match.group(1) if diff_stat_match else ""
+
+            # Extract hint text if present
+            hint_match = re.search(r"<hint_text>(.*?)</hint_text>", user_prompt, re.DOTALL)
+            hint = hint_match.group(1) if hint_match else ""
+
+            questions = generate_contextual_questions(
+                model=model,
+                status=status,
+                processed_diff=diff,
+                diff_stat=diff_stat,
+                hint=hint,
+                temperature=temperature,
+                max_tokens=max_output_tokens,
+                max_retries=max_retries,
+                quiet=quiet,
+            )
+
+            if questions:
+                # Collect answers interactively
+                answers = collect_interactive_answers(questions)
+
+                if answers is None:
+                    # User aborted interactive mode
+                    if not quiet:
+                        console.print("[yellow]Proceeding with commit without additional context[/yellow]\n")
+                elif answers:
+                    # User provided some answers, format them for the prompt
+                    answers_context = format_answers_for_prompt(answers)
+                    enhanced_user_prompt = user_prompt + answers_context
+
+                    # Update the conversation messages with the enhanced prompt
+                    if conversation_messages and conversation_messages[-1]["role"] == "user":
+                        conversation_messages[-1]["content"] = enhanced_user_prompt
+
+                    logger.info(f"Collected answers for {len(answers)} questions")
+                else:
+                    # User skipped all questions
+                    if not quiet:
+                        console.print("[dim]No answers provided, proceeding with original context[/dim]\n")
+
+        except Exception as e:
+            logger.warning(f"Failed to generate contextual questions, proceeding without them: {e}")
+            if not quiet:
+                console.print("[yellow]⚠️  Could not generate contextual questions, proceeding normally[/yellow]\n")
+
+    first_iteration = True
+    content_retry_budget = max(3, int(max_retries))
+    attempts = 0
+
+    grouped_result: dict | None = None
+    raw_response: str = ""
+
+    while True:
+        prompt_tokens = count_tokens(conversation_messages, model)
+
+        if first_iteration:
+            warning_limit_val = config.get("warning_limit_tokens", EnvDefaults.WARNING_LIMIT_TOKENS)
+            assert warning_limit_val is not None
+            warning_limit = int(warning_limit_val)
+            if not check_token_warning(prompt_tokens, warning_limit, require_confirmation):
+                sys.exit(0)
+        first_iteration = False
+
+        raw_response = generate_grouped_commits(
+            model=model,
+            prompt=conversation_messages,
+            temperature=temperature,
+            max_tokens=max_output_tokens,
+            max_retries=max_retries,
+            quiet=quiet,
+            skip_success_message=True,
+        )
+
+        parsed: dict | None = None
+        extract = raw_response
+        first_brace = raw_response.find("{")
+        last_brace = raw_response.rfind("}")
+        if first_brace != -1 and last_brace != -1 and first_brace < last_brace:
+            extract = raw_response[first_brace : last_brace + 1]
+
+        try:
+            parsed = json.loads(extract)
+        except json.JSONDecodeError as e:
+            parsed = None
+            logger.debug(
+                f"JSON parsing failed: {e}. Extract length: {len(extract)}, Response length: {len(raw_response)}"
+            )
+
+        if parsed is None:
+            attempts += 1
+            feedback = "Your response was not valid JSON. Respond with ONLY valid JSON matching the expected schema. Do not include any commentary or code fences."
+            error_msg = f"Failed to parse LLM response as JSON after {attempts} retries."
+            if _handle_validation_retry(
+                attempts,
+                content_retry_budget,
+                raw_response,
+                feedback,
+                error_msg,
+                conversation_messages,
+                quiet,
+                "JSON parsing failed, asking model to fix...",
+            ):
+                sys.exit(1)
+            continue
+
+        try:
+            if "commits" not in parsed or not isinstance(parsed["commits"], list):
+                raise ValueError("Response missing 'commits' array")
+            if len(parsed["commits"]) == 0:
+                raise ValueError("No commits in response")
+            for idx, commit in enumerate(parsed["commits"]):
+                if "files" not in commit or not isinstance(commit["files"], list):
+                    raise ValueError(f"Commit {idx + 1} missing 'files' array")
+                if "message" not in commit or not isinstance(commit["message"], str):
+                    raise ValueError(f"Commit {idx + 1} missing 'message' string")
+                if len(commit["files"]) == 0:
+                    raise ValueError(f"Commit {idx + 1} has empty files list")
+                if not commit["message"].strip():
+                    raise ValueError(f"Commit {idx + 1} has empty message")
+        except (ValueError, TypeError) as e:
+            attempts += 1
+            feedback = f"Invalid response structure: {e}. Please return ONLY valid JSON following the schema with a non-empty 'commits' array of objects containing 'files' and 'message'."
+            error_msg = f"Invalid grouped commits structure after {attempts} retries: {e}"
+            if _handle_validation_retry(
+                attempts,
+                content_retry_budget,
+                raw_response,
+                feedback,
+                error_msg,
+                conversation_messages,
+                quiet,
+                "Structure validation failed, asking model to fix...",
+            ):
+                sys.exit(1)
+            continue
+
+        staged_set = set(get_staged_files(existing_only=False))
+        ok, feedback, detail_msg = _validate_grouped_files_or_feedback(staged_set, parsed)
+        if not ok:
+            attempts += 1
+            error_msg = (
+                f"Grouped commits file set mismatch after {attempts} retries{': ' + detail_msg if detail_msg else ''}"
+            )
+            if _handle_validation_retry(
+                attempts,
+                content_retry_budget,
+                raw_response,
+                feedback,
+                error_msg,
+                conversation_messages,
+                quiet,
+                "File coverage mismatch, asking model to fix...",
+            ):
+                sys.exit(1)
+            continue
+
+        grouped_result = parsed
+        conversation_messages.append({"role": "assistant", "content": raw_response})
+
+        if not quiet:
+            console.print(f"[green]✔ Generated commit messages with {provider} {model_name}[/green]")
+            num_commits = len(grouped_result["commits"])
+            console.print(f"[bold green]Proposed Commits ({num_commits}):[/bold green]\n")
+            for idx, commit in enumerate(grouped_result["commits"], 1):
+                files = commit["files"]
+                files_display = ", ".join(files)
+                console.print(f"[dim]{files_display}[/dim]")
+                commit_msg = commit["message"]
+                console.print(Panel(commit_msg, title=f"Commit Message {idx}/{num_commits}", border_style="cyan"))
+                console.print()
+
+            completion_tokens = count_tokens(raw_response, model)
+            total_tokens = prompt_tokens + completion_tokens
+            console.print(
+                f"[dim]Token usage: {prompt_tokens} prompt + {completion_tokens} completion = {total_tokens} total[/dim]"
+            )
+
+        if require_confirmation:
+            accepted = False
+            num_commits = len(grouped_result["commits"]) if grouped_result else 0
+            while True:
+                response = click.prompt(
+                    f"Proceed with {num_commits} commits above? [y/n/r/<feedback>]",
+                    type=str,
+                    show_default=False,
+                ).strip()
+                response_lower = response.lower()
+
+                if response_lower in ["y", "yes"]:
+                    accepted = True
+                    break
+                if response_lower in ["n", "no"]:
+                    console.print("[yellow]Commits not accepted. Exiting...[/yellow]")
+                    sys.exit(0)
+                if response == "":
+                    continue
+                if response_lower in ["r", "reroll"]:
+                    feedback_message = "Please provide alternative commit groupings using the same repository context."
+                    console.print("[cyan]Regenerating commit groups...[/cyan]")
+                    conversation_messages.append({"role": "user", "content": feedback_message})
+                    console.print()
+                    attempts = 0
+                    break
+
+                feedback_message = f"Please revise the commit groupings based on this feedback: {response}"
+                console.print(f"[cyan]Regenerating commit groups with feedback: {response}[/cyan]")
+                conversation_messages.append({"role": "user", "content": feedback_message})
+                console.print()
+                attempts = 0
+                break
+
+            if not accepted:
+                continue
+
+        num_commits = len(grouped_result["commits"]) if grouped_result else 0
+        if dry_run:
+            console.print(f"[yellow]Dry run: Would create {num_commits} commits[/yellow]")
+            for idx, commit in enumerate(grouped_result["commits"], 1):
+                console.print(f"\n[cyan]Commit {idx}/{num_commits}:[/cyan]")
+                console.print(f"  Files: {', '.join(commit['files'])}")
+                console.print(f"  Message: {commit['message'][:50]}...")
+        else:
+            original_staged_files = get_staged_files(existing_only=False)
+            original_staged_diff = run_git_command(["diff", "--cached", "--binary"], silent=True)
+            run_git_command(["reset", "HEAD"])
+
+            try:
+                # Detect file renames to handle them properly
+                rename_mappings = detect_rename_mappings(original_staged_diff)
+
+                for idx, commit in enumerate(grouped_result["commits"], 1):
+                    try:
+                        for file_path in commit["files"]:
+                            # Check if this file is the destination of a rename
+                            if file_path in rename_mappings:
+                                old_file = rename_mappings[file_path]
+                                # For renames, stage both the old file (for deletion) and new file
+                                # This ensures the complete rename operation is preserved
+                                run_git_command(["add", "-A", old_file])
+                                run_git_command(["add", "-A", file_path])
+                            else:
+                                run_git_command(["add", "-A", file_path])
+                        execute_commit(commit["message"], no_verify, hook_timeout)
+                        console.print(f"[green]✓ Commit {idx}/{num_commits} created[/green]")
+                    except Exception as e:
+                        console.print(f"[red]✗ Failed at commit {idx}/{num_commits}: {e}[/red]")
+                        console.print(f"[yellow]Completed {idx - 1}/{num_commits} commits.[/yellow]")
+                        if idx == 1:
+                            console.print("[yellow]Restoring original staging area...[/yellow]")
+                            restore_staging(original_staged_files, original_staged_diff)
+                            console.print("[green]Original staging area restored.[/green]")
+                        sys.exit(1)
+            except KeyboardInterrupt:
+                console.print("\n[yellow]Interrupted by user. Restoring original staging area...[/yellow]")
+                restore_staging(original_staged_files, original_staged_diff)
+                console.print("[green]Original staging area restored.[/green]")
+                sys.exit(1)
+
+        if push:
+            try:
+                if dry_run:
+                    console.print("[yellow]Dry run: Would push changes[/yellow]")
+                    sys.exit(0)
+                if push_changes():
+                    logger.info("Changes pushed successfully")
+                    console.print("[green]Changes pushed successfully[/green]")
+                else:
+                    console.print(
+                        "[red]Failed to push changes. Check your remote configuration and network connection.[/red]"
+                    )
+                    sys.exit(1)
+            except Exception as e:
+                console.print(f"[red]Error pushing changes: {e}[/red]")
+                sys.exit(1)
+
+        sys.exit(0)
+
+
+def execute_single_commit_workflow(
+    *,
+    system_prompt: str,
+    user_prompt: str,
+    model: str,
+    temperature: float,
+    max_output_tokens: int,
+    max_retries: int,
+    require_confirmation: bool,
+    quiet: bool,
+    no_verify: bool,
+    dry_run: bool,
+    message_only: bool = False,
+    push: bool,
+    show_prompt: bool,
+    hook_timeout: int = 120,
+    interactive: bool = False,
+) -> None:
+    if show_prompt:
+        full_prompt = f"SYSTEM PROMPT:\n{system_prompt}\n\nUSER PROMPT:\n{user_prompt}"
+        console.print(Panel(full_prompt, title="Prompt for LLM", border_style="bright_blue"))
+
+    conversation_messages: list[dict[str, str]] = []
+    if system_prompt:
+        conversation_messages.append({"role": "system", "content": system_prompt})
+    conversation_messages.append({"role": "user", "content": user_prompt})
+
+    _parse_model_identifier(model)
+
+    # Generate interactive questions if enabled
+    if interactive and not message_only:
+        try:
+            # Extract git data from the user prompt for question generation
+            status_match = None
+            diff_match = None
+            diff_stat_match = None
+
+            import re
+
+            status_match = re.search(r"<git_status>\n(.*?)\n</git_status>", user_prompt, re.DOTALL)
+            diff_match = re.search(r"<git_diff>\n(.*?)\n</git_diff>", user_prompt, re.DOTALL)
+            diff_stat_match = re.search(r"<git_diff_stat>\n(.*?)\n</git_diff_stat>", user_prompt, re.DOTALL)
+
+            status = status_match.group(1) if status_match else ""
+            diff = diff_match.group(1) if diff_match else ""
+            diff_stat = diff_stat_match.group(1) if diff_stat_match else ""
+
+            # Extract hint text if present
+            hint_match = re.search(r"<hint_text>(.*?)</hint_text>", user_prompt, re.DOTALL)
+            hint = hint_match.group(1) if hint_match else ""
+
+            questions = generate_contextual_questions(
+                model=model,
+                status=status,
+                processed_diff=diff,
+                diff_stat=diff_stat,
+                hint=hint,
+                temperature=temperature,
+                max_tokens=max_output_tokens,
+                max_retries=max_retries,
+                quiet=quiet,
+            )
+
+            if questions:
+                # Collect answers interactively
+                answers = collect_interactive_answers(questions)
+
+                if answers is None:
+                    # User aborted interactive mode
+                    if not quiet:
+                        console.print("[yellow]Proceeding with commit without additional context[/yellow]\n")
+                elif answers:
+                    # User provided some answers, format them for the prompt
+                    answers_context = format_answers_for_prompt(answers)
+                    enhanced_user_prompt = user_prompt + answers_context
+
+                    # Update the conversation messages with the enhanced prompt
+                    if conversation_messages and conversation_messages[-1]["role"] == "user":
+                        conversation_messages[-1]["content"] = enhanced_user_prompt
+
+                    logger.info(f"Collected answers for {len(answers)} questions")
+                else:
+                    # User skipped all questions
+                    if not quiet:
+                        console.print("[dim]No answers provided, proceeding with original context[/dim]\n")
+
+        except Exception as e:
+            logger.warning(f"Failed to generate contextual questions, proceeding without them: {e}")
+            if not quiet:
+                console.print("[yellow]⚠️  Could not generate contextual questions, proceeding normally[/yellow]\n")
+
+    first_iteration = True
+    while True:
+        prompt_tokens = count_tokens(conversation_messages, model)
+        if first_iteration:
+            warning_limit_val = config.get("warning_limit_tokens", EnvDefaults.WARNING_LIMIT_TOKENS)
+            assert warning_limit_val is not None
+            warning_limit = int(warning_limit_val)
+            if not check_token_warning(prompt_tokens, warning_limit, require_confirmation):
+                sys.exit(0)
+        first_iteration = False
+
+        raw_commit_message = generate_commit_message(
+            model=model,
+            prompt=conversation_messages,
+            temperature=temperature,
+            max_tokens=max_output_tokens,
+            max_retries=max_retries,
+            quiet=quiet or message_only,
+        )
+        commit_message = clean_commit_message(raw_commit_message)
+        logger.info("Generated commit message:")
+        logger.info(commit_message)
+        conversation_messages.append({"role": "assistant", "content": commit_message})
+
+        if message_only:
+            # Output only the commit message without any formatting
+            print(commit_message)
+            sys.exit(0)
+
+        display_commit_message(commit_message, prompt_tokens, model, quiet)
+
+        if require_confirmation:
+            decision, commit_message, conversation_messages = handle_confirmation_loop(
+                commit_message, conversation_messages, quiet, model
+            )
+            if decision == "no":
+                console.print("[yellow]Prompt not accepted. Exiting...[/yellow]")
+                sys.exit(0)
+            elif decision == "yes":
+                break
+        else:
+            break
+
+    if dry_run:
+        console.print("[yellow]Dry run: Commit message generated but not applied[/yellow]")
+        console.print("Would commit with message:")
+        console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
+        staged_files = get_staged_files(existing_only=False)
+        console.print(f"Would commit {len(staged_files)} files")
+        logger.info(f"Would commit {len(staged_files)} files")
+    else:
+        execute_commit(commit_message, no_verify, hook_timeout)
+
+    if push:
+        try:
+            if dry_run:
+                staged_files = get_staged_files(existing_only=False)
+                logger.info("Dry run: Would push changes")
+                logger.info("Would push with message:")
+                logger.info(commit_message)
+                logger.info(f"Would push {len(staged_files)} files")
+                console.print("[yellow]Dry run: Would push changes[/yellow]")
+                console.print("Would push with message:")
+                console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
+                console.print(f"Would push {len(staged_files)} files")
+                sys.exit(0)
+            if push_changes():
+                logger.info("Changes pushed successfully")
+                console.print("[green]Changes pushed successfully[/green]")
+            else:
+                console.print(
+                    "[red]Failed to push changes. Check your remote configuration and network connection.[/red]"
+                )
+                sys.exit(1)
+        except Exception as e:
+            console.print(f"[red]Error pushing changes: {e}[/red]")
+            sys.exit(1)
+
+    if not quiet:
+        logger.info("Successfully committed changes with message:")
+        logger.info(commit_message)
+        if push:
+            logger.info("Changes pushed to remote.")
+    sys.exit(0)
+
+
+def generate_contextual_questions(
+    model: str,
+    status: str,
+    processed_diff: str,
+    diff_stat: str = "",
+    hint: str = "",
+    temperature: float = EnvDefaults.TEMPERATURE,
+    max_tokens: int = EnvDefaults.MAX_OUTPUT_TOKENS,
+    max_retries: int = EnvDefaults.MAX_RETRIES,
+    quiet: bool = False,
+) -> list[str]:
+    """Generate contextual questions about staged changes when interactive mode is enabled.
+
+    Args:
+        model: The model to use in provider:model_name format
+        status: Git status output
+        processed_diff: Git diff output, already preprocessed
+        diff_stat: Git diff stat output showing file changes summary
+        hint: Optional hint to guide the question generation
+        temperature: Controls randomness for generation
+        max_tokens: Maximum tokens in the response
+        max_retries: Number of retry attempts if generation fails
+        quiet: If True, suppress progress indicators
+
+    Returns:
+        A list of contextual questions about the staged changes
+
+    Raises:
+        AIError: If question generation fails after max_retries attempts
+    """
+    from gac.prompt import build_question_generation_prompt
+
+    try:
+        # Build prompts for question generation
+        system_prompt, user_prompt = build_question_generation_prompt(
+            status=status,
+            processed_diff=processed_diff,
+            diff_stat=diff_stat,
+            hint=hint,
+        )
+
+        # Generate questions using existing infrastructure
+        logger.info("Generating contextual questions about staged changes...")
+        questions_text = generate_commit_message(
+            model=model,
+            prompt=(system_prompt, user_prompt),
+            temperature=temperature,
+            max_tokens=max_tokens,
+            max_retries=max_retries,
+            quiet=quiet,
+            skip_success_message=True,  # Don't show "Generated commit message" for questions
+            task_description="contextual questions",
+        )
+
+        # Parse the response to extract individual questions
+        questions = _parse_questions_from_response(questions_text)
+
+        logger.info(f"Generated {len(questions)} contextual questions")
+        return questions
+
+    except Exception as e:
+        logger.error(f"Failed to generate contextual questions: {e}")
+        raise AIError.model_error(f"Failed to generate contextual questions: {e}") from e
+
+
+def _parse_questions_from_response(response: str) -> list[str]:
+    """Parse the AI response to extract individual questions from a numbered list.
+
+    Args:
+        response: The raw response from the AI model
+
+    Returns:
+        A list of cleaned questions
+    """
+    import re
+
+    questions = []
+    lines = response.strip().split("\n")
+
+    for line in lines:
+        line = line.strip()
+        if not line:
+            continue
+
+        # Match numbered list format (e.g., "1. Question text?" or "1) Question text?")
+        match = re.match(r"^\d+\.\s+(.+)$", line)
+        if not match:
+            match = re.match(r"^\d+\)\s+(.+)$", line)
+
+        if match:
+            question = match.group(1).strip()
+            # Remove any leading symbols like •, -, *
+            question = re.sub(r"^[•\-*]\s+", "", question)
+            if question and question.endswith("?"):
+                questions.append(question)
+        elif line.endswith("?") and len(line) > 5:  # Fallback for non-numbered questions
+            questions.append(line)
+
+    return questions
+
+
 def main(
     stage_all: bool = False,
+    group: bool = False,
+    interactive: bool = False,
     model: str | None = None,
     hint: str = "",
     one_liner: bool = False,
@@ -43,9 +745,12 @@ def main(
     push: bool = False,
     quiet: bool = False,
     dry_run: bool = False,
+    message_only: bool = False,
     verbose: bool = False,
     no_verify: bool = False,
     skip_secret_scan: bool = False,
+    language: str | None = None,
+    hook_timeout: int = 120,
 ) -> None:
     """Main application logic for gac."""
     try:
@@ -83,33 +788,35 @@ def main(
         logger.info("Staging all changes")
         run_git_command(["add", "--all"])
 
-    # Check for staged files
     staged_files = get_staged_files(existing_only=False)
+
+    if group:
+        num_files = len(staged_files)
+        multiplier = min(5, 2 + (num_files // 10))
+        max_output_tokens *= multiplier
+        logger.debug(f"Grouped mode: scaling max_output_tokens by {multiplier}x for {num_files} files")
+
     if not staged_files:
         console.print(
             "[yellow]No staged changes found. Stage your changes with git add first or use --add-all.[/yellow]"
         )
         sys.exit(0)
 
-    # Run pre-commit and lefthook hooks before doing expensive operations
     if not no_verify and not dry_run:
-        # Run lefthook hooks
-        if not run_lefthook_hooks():
+        if not run_lefthook_hooks(hook_timeout):
             console.print("[red]Lefthook hooks failed. Please fix the issues and try again.[/red]")
             console.print("[yellow]You can use --no-verify to skip pre-commit and lefthook hooks.[/yellow]")
             sys.exit(1)
 
-        # Run pre-commit hooks
-        if not run_pre_commit_hooks():
+        if not run_pre_commit_hooks(hook_timeout):
             console.print("[red]Pre-commit hooks failed. Please fix the issues and try again.[/red]")
             console.print("[yellow]You can use --no-verify to skip pre-commit and lefthook hooks.[/yellow]")
             sys.exit(1)
 
-    status = run_git_command(["status"])
+    status = get_staged_status()
     diff = run_git_command(["diff", "--staged"])
     diff_stat = " " + run_git_command(["diff", "--stat", "--cached"])
 
-    # Security scan for secrets
     if not skip_secret_scan:
         logger.info("Scanning staged changes for potential secrets...")
         secrets = scan_staged_diff(diff)
@@ -168,19 +875,29 @@ def main(
                     sys.exit(0)
 
                 console.print(f"[green]Continuing with {len(remaining_staged)} staged file(s)...[/green]")
-                # Refresh all git state variables after removing files
-                status = run_git_command(["status"])
+                status = get_staged_status()
                 diff = run_git_command(["diff", "--staged"])
                 diff_stat = " " + run_git_command(["diff", "--stat", "--cached"])
         else:
             logger.info("No secrets detected in staged changes")
 
-    # Preprocess the diff before passing to build_prompt
     logger.debug(f"Preprocessing diff ({len(diff)} characters)")
     assert model is not None
     processed_diff = preprocess_diff(diff, token_limit=Utility.DEFAULT_DIFF_TOKEN_LIMIT, model=model)
     logger.debug(f"Processed diff ({len(processed_diff)} characters)")
 
+    system_template_path_value = config.get("system_prompt_path")
+    system_template_path: str | None = (
+        system_template_path_value if isinstance(system_template_path_value, str) else None
+    )
+
+    if language is None:
+        language_value = config.get("language")
+        language = language_value if isinstance(language_value, str) else None
+
+    translate_prefixes_value = config.get("translate_prefixes")
+    translate_prefixes: bool = bool(translate_prefixes_value) if isinstance(translate_prefixes_value, bool) else False
+
     system_prompt, user_prompt = build_prompt(
         status=status,
         processed_diff=processed_diff,
@@ -189,166 +906,117 @@ def main(
         hint=hint,
         infer_scope=infer_scope,
         verbose=verbose,
+        system_template_path=system_template_path,
+        language=language,
+        translate_prefixes=translate_prefixes,
     )
 
-    if show_prompt:
-        # Show both system and user prompts
-        full_prompt = f"SYSTEM PROMPT:\n{system_prompt}\n\nUSER PROMPT:\n{user_prompt}"
-        console.print(
-            Panel(
-                full_prompt,
-                title="Prompt for LLM",
-                border_style="bright_blue",
-            )
+    if group:
+        from gac.prompt import build_group_prompt
+
+        system_prompt, user_prompt = build_group_prompt(
+            status=status,
+            processed_diff=processed_diff,
+            diff_stat=diff_stat,
+            one_liner=one_liner,
+            hint=hint,
+            infer_scope=infer_scope,
+            verbose=verbose,
+            system_template_path=system_template_path,
+            language=language,
+            translate_prefixes=translate_prefixes,
         )
 
-    conversation_messages: list[dict[str, str]] = []
-    if system_prompt:
-        conversation_messages.append({"role": "system", "content": system_prompt})
-    conversation_messages.append({"role": "user", "content": user_prompt})
-
-    try:
-        first_iteration = True
-
-        while True:
-            prompt_tokens = count_tokens(conversation_messages, model)
-
-            if first_iteration:
-                warning_limit_val = config.get("warning_limit_tokens", EnvDefaults.WARNING_LIMIT_TOKENS)
-                assert warning_limit_val is not None
-                warning_limit = int(warning_limit_val)
-                if warning_limit and prompt_tokens > warning_limit:
-                    console.print(
-                        f"[yellow]⚠️  WARNING: Prompt contains {prompt_tokens} tokens, which exceeds the warning limit of "
-                        f"{warning_limit} tokens.[/yellow]"
-                    )
-                    if require_confirmation:
-                        proceed = click.confirm("Do you want to continue anyway?", default=True)
-                        if not proceed:
-                            console.print("[yellow]Aborted due to token limit.[/yellow]")
-                            sys.exit(0)
-
-            first_iteration = False
-
-            raw_commit_message = generate_commit_message(
+        try:
+            execute_grouped_commits_workflow(
+                system_prompt=system_prompt,
+                user_prompt=user_prompt,
                 model=model,
-                prompt=conversation_messages,
                 temperature=temperature,
-                max_tokens=max_output_tokens,
+                max_output_tokens=max_output_tokens,
                 max_retries=max_retries,
+                require_confirmation=require_confirmation,
                 quiet=quiet,
+                no_verify=no_verify,
+                dry_run=dry_run,
+                push=push,
+                show_prompt=show_prompt,
+                hook_timeout=hook_timeout,
+                interactive=interactive,
+                message_only=message_only,
             )
-            commit_message = clean_commit_message(raw_commit_message)
-
-            logger.info("Generated commit message:")
-            logger.info(commit_message)
-
-            conversation_messages.append({"role": "assistant", "content": commit_message})
-
-            console.print("[bold green]Generated commit message:[/bold green]")
-            console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
-
-            if not quiet:
-                completion_tokens = count_tokens(commit_message, model)
-                total_tokens = prompt_tokens + completion_tokens
-                console.print(
-                    f"[dim]Token usage: {prompt_tokens} prompt + {completion_tokens} completion = {total_tokens} "
-                    "total[/dim]"
-                )
-
-            if require_confirmation:
-                # Custom prompt that accepts y/n/r or "r <feedback (optional)>"
-                while True:
-                    response = click.prompt(
-                        "Proceed with commit above? [y/n/r <feedback>]", type=str, show_default=False
-                    ).strip()
-                    response_lower = response.lower()
-
-                    if response_lower in ["y", "yes"]:
-                        break
-                    if response_lower in ["n", "no"]:
-                        console.print("[yellow]Prompt not accepted. Exiting...[/yellow]")
-                        sys.exit(0)
-                    if response_lower == "r" or response_lower == "reroll" or response_lower.startswith("r "):
-                        if response_lower == "r" or response_lower == "reroll":
-                            feedback_message = (
-                                "Please provide an alternative commit message using the same repository context."
-                            )
-                            console.print("[cyan]Regenerating commit message...[/cyan]")
-                        else:
-                            reroll_feedback = response[2:].strip()
-                            feedback_message = (
-                                f"Please revise the commit message based on this feedback: {reroll_feedback}"
-                            )
-                            console.print(f"[cyan]Regenerating commit message with feedback: {reroll_feedback}[/cyan]")
-
-                        conversation_messages.append({"role": "user", "content": feedback_message})
-
-                        console.print()  # Add blank line for readability
-                        break
-
-                    console.print(
-                        "[red]Invalid response. Please enter y (yes), n (no), r (reroll), or r <feedback>.[/red]"
-                    )
-
-                if response_lower in ["y", "yes"]:
-                    break
-            else:
-                break
-
-        if dry_run:
-            console.print("[yellow]Dry run: Commit message generated but not applied[/yellow]")
-            console.print("Would commit with message:")
-            console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
-            staged_files = get_staged_files(existing_only=False)
-            console.print(f"Would commit {len(staged_files)} files")
-            logger.info(f"Would commit {len(staged_files)} files")
-        else:
-            commit_args = ["commit", "-m", commit_message]
-            if no_verify:
-                commit_args.append("--no-verify")
-            run_git_command(commit_args)
-            logger.info("Commit created successfully")
-            console.print("[green]Commit created successfully[/green]")
-    except AIError as e:
-        logger.error(str(e))
-        console.print(f"[red]Failed to generate commit message: {str(e)}[/red]")
-        sys.exit(1)
-
-    if push:
+        except AIError as e:
+            logger.error(str(e))
+            console.print(f"[red]Failed to generate grouped commits: {str(e)}[/red]")
+            sys.exit(1)
+    else:
         try:
-            if dry_run:
-                staged_files = get_staged_files(existing_only=False)
-
-                logger.info("Dry run: Would push changes")
-                logger.info("Would push with message:")
-                logger.info(commit_message)
-                logger.info(f"Would push {len(staged_files)} files")
-
-                console.print("[yellow]Dry run: Would push changes[/yellow]")
-                console.print("Would push with message:")
-                console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
-                console.print(f"Would push {len(staged_files)} files")
-                sys.exit(0)
-
-            if push_changes():
-                logger.info("Changes pushed successfully")
-                console.print("[green]Changes pushed successfully[/green]")
+            execute_single_commit_workflow(
+                system_prompt=system_prompt,
+                user_prompt=user_prompt,
+                model=model,
+                temperature=temperature,
+                max_output_tokens=max_output_tokens,
+                max_retries=max_retries,
+                require_confirmation=require_confirmation,
+                quiet=quiet,
+                no_verify=no_verify,
+                dry_run=dry_run,
+                message_only=message_only,
+                push=push,
+                show_prompt=show_prompt,
+                hook_timeout=hook_timeout,
+                interactive=interactive,
+            )
+        except AIError as e:
+            # Check if this is a Claude Code OAuth token expiration
+            if (
+                e.error_type == "authentication"
+                and model.startswith("claude-code:")
+                and ("expired" in str(e).lower() or "oauth" in str(e).lower())
+            ):
+                logger.error(str(e))
+                console.print("[yellow]⚠ Claude Code OAuth token has expired[/yellow]")
+                console.print("[cyan]🔐 Starting automatic re-authentication...[/cyan]")
+
+                try:
+                    from gac.oauth.claude_code import authenticate_and_save
+
+                    if authenticate_and_save(quiet=quiet):
+                        console.print("[green]✓ Re-authentication successful![/green]")
+                        console.print("[cyan]Retrying commit...[/cyan]\n")
+
+                        # Retry the commit workflow
+                        execute_single_commit_workflow(
+                            system_prompt=system_prompt,
+                            user_prompt=user_prompt,
+                            model=model,
+                            temperature=temperature,
+                            max_output_tokens=max_output_tokens,
+                            max_retries=max_retries,
+                            require_confirmation=require_confirmation,
+                            quiet=quiet,
+                            no_verify=no_verify,
+                            dry_run=dry_run,
+                            message_only=message_only,
+                            push=push,
+                            show_prompt=show_prompt,
+                            hook_timeout=hook_timeout,
+                            interactive=interactive,
+                        )
+                    else:
+                        console.print("[red]Re-authentication failed.[/red]")
+                        console.print("[yellow]Run 'gac model' to re-authenticate manually.[/yellow]")
+                        sys.exit(1)
+                except Exception as auth_error:
+                    console.print(f"[red]Re-authentication error: {auth_error}[/red]")
+                    console.print("[yellow]Run 'gac model' to re-authenticate manually.[/yellow]")
+                    sys.exit(1)
             else:
-                console.print(
-                    "[red]Failed to push changes. Check your remote configuration and network connection.[/red]"
-                )
+                # Non-Claude Code error or non-auth error
+                logger.error(str(e))
+                console.print(f"[red]Failed to generate commit message: {str(e)}[/red]")
                 sys.exit(1)
-        except Exception as e:
-            console.print(f"[red]Error pushing changes: {e}[/red]")
-            sys.exit(1)
-
-    if not quiet:
-        logger.info("Successfully committed changes with message:")
-        logger.info(commit_message)
-        if push:
-            logger.info("Changes pushed to remote.")
-    sys.exit(0)
 
 
 if __name__ == "__main__":