gac 3.8.1__py3-none-any.whl → 3.10.10__py3-none-any.whl

gac/main.py

@@ -4,765 +4,142 @@ prompt building, AI generation, and commit/push operations. This module contains
 """
 
 import logging
-import sys
 
-import click
 from rich.console import Console
-from rich.panel import Panel
 
 from gac.ai import generate_commit_message
 from gac.ai_utils import count_tokens
-from gac.config import load_config
-from gac.constants import EnvDefaults, Utility
-from gac.errors import AIError, ConfigError, GitError, handle_error
-from gac.git import (
-    detect_rename_mappings,
-    get_staged_files,
-    get_staged_status,
-    push_changes,
-    run_git_command,
-    run_lefthook_hooks,
-    run_pre_commit_hooks,
-)
-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,
-)
+from gac.commit_executor import CommitExecutor
+from gac.config import GACConfig, load_config
+from gac.errors import AIError, ConfigError, handle_error
+from gac.git import run_lefthook_hooks, run_pre_commit_hooks
+from gac.git_state_validator import GitStateValidator
+from gac.grouped_commit_workflow import GroupedCommitWorkflow
+from gac.interactive_mode import InteractiveMode
+from gac.oauth_retry import handle_oauth_retry
+from gac.postprocess import clean_commit_message
+from gac.prompt_builder import PromptBuilder
+from gac.workflow_context import CLIOptions, GenerationConfig, WorkflowContext, WorkflowFlags, WorkflowState
+from gac.workflow_utils import check_token_warning, display_commit_message
 
 logger = logging.getLogger(__name__)
 
-config = load_config()
+config: GACConfig = 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
+def _execute_single_commit_workflow(ctx: WorkflowContext) -> int:
+    """Execute single commit workflow using extracted components.
 
-    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"))
+    Args:
+        ctx: WorkflowContext containing all configuration, flags, and state
 
+    Returns:
+        Exit code: 0 for success, non-zero for failure/abort
+    """
     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)
-            if warning_limit_val is None:
-                raise ConfigError("warning_limit_tokens configuration missing")
-            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,
+    if ctx.system_prompt:
+        conversation_messages.append({"role": "system", "content": ctx.system_prompt})
+    conversation_messages.append({"role": "user", "content": ctx.user_prompt})
+
+    # Handle interactive questions if enabled
+    if ctx.interactive and not ctx.message_only:
+        ctx.state.interactive_mode.handle_interactive_flow(
+            model=ctx.model,
+            user_prompt=ctx.user_prompt,
+            git_state=ctx.git_state,
+            hint=ctx.hint,
+            conversation_messages=conversation_messages,
+            temperature=ctx.temperature,
+            max_tokens=ctx.max_output_tokens,
+            max_retries=ctx.max_retries,
+            quiet=ctx.quiet,
         )
 
-        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"].strip()
-                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'].strip()[: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"].strip(), 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")
-
+    # Generate commit message
     first_iteration = True
     while True:
-        prompt_tokens = count_tokens(conversation_messages, model)
+        prompt_tokens = count_tokens(conversation_messages, ctx.model)
         if first_iteration:
-            warning_limit_val = config.get("warning_limit_tokens", EnvDefaults.WARNING_LIMIT_TOKENS)
-            if warning_limit_val is None:
-                raise ConfigError("warning_limit_tokens configuration missing")
-            warning_limit = int(warning_limit_val)
-            if not check_token_warning(prompt_tokens, warning_limit, require_confirmation):
-                sys.exit(0)
+            warning_limit = config["warning_limit_tokens"]
+            if not check_token_warning(prompt_tokens, warning_limit, ctx.flags.require_confirmation):
+                return 0  # User declined due to token warning
         first_iteration = False
 
         raw_commit_message = generate_commit_message(
-            model=model,
+            model=ctx.model,
             prompt=conversation_messages,
-            temperature=temperature,
-            max_tokens=max_output_tokens,
-            max_retries=max_retries,
-            quiet=quiet or message_only,
+            temperature=ctx.temperature,
+            max_tokens=ctx.max_output_tokens,
+            max_retries=ctx.max_retries,
+            quiet=ctx.quiet or ctx.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
+        if ctx.message_only:
             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
+            return 0
+
+        # Display commit message panel (always show, regardless of confirmation mode)
+        if not ctx.quiet:
+            display_commit_message(commit_message, prompt_tokens, ctx.model, ctx.quiet)
+
+        # Handle confirmation
+        if ctx.flags.require_confirmation:
+            final_message, decision = ctx.state.interactive_mode.handle_single_commit_confirmation(
+                model=ctx.model,
+                commit_message=commit_message,
+                conversation_messages=conversation_messages,
+                quiet=ctx.quiet,
             )
-            if decision == "no":
-                console.print("[yellow]Prompt not accepted. Exiting...[/yellow]")
-                sys.exit(0)
-            elif decision == "yes":
+            if decision == "yes":
+                commit_message = final_message
                 break
+            elif decision == "no":
+                console.print("[yellow]Commit aborted.[/yellow]")
+                return 0  # User aborted
+            # decision == "regenerate": continue the loop
         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)
+    # Execute the commit
+    ctx.state.commit_executor.create_commit(commit_message)
 
-    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)
+    # Push if requested
+    if ctx.flags.push:
+        ctx.state.commit_executor.push_to_remote()
 
-    if not quiet:
+    if not ctx.quiet:
         logger.info("Successfully committed changes with message:")
         logger.info(commit_message)
-        if push:
+        if ctx.flags.push:
             logger.info("Changes pushed to remote.")
-    sys.exit(0)
+    return 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.
+def main(opts: CLIOptions) -> int:
+    """Main application logic for gac.
 
     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
+        opts: CLI options bundled in a dataclass
 
     Returns:
-        A list of contextual questions about the staged changes
-
-    Raises:
-        AIError: If question generation fails after max_retries attempts
+        Exit code: 0 for success, non-zero for failure
     """
-    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,
-    show_prompt: bool = False,
-    infer_scope: bool = False,
-    require_confirmation: bool = True,
-    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:
-        git_dir = run_git_command(["rev-parse", "--show-toplevel"])
-        if not git_dir:
-            raise GitError("Not in a git repository")
-    except Exception as e:
-        logger.error(f"Error checking git repository: {e}")
-        handle_error(GitError("Not in a git repository"), exit_program=True)
+    # Initialize components
+    git_validator = GitStateValidator(config)
+    prompt_builder = PromptBuilder(config)
+    commit_executor = CommitExecutor(
+        dry_run=opts.dry_run, quiet=opts.quiet, no_verify=opts.no_verify, hook_timeout=opts.hook_timeout
+    )
+    interactive_mode = InteractiveMode(config)
+    grouped_workflow = GroupedCommitWorkflow(config)
 
+    # Validate and get model configuration
+    model = opts.model
     if model is None:
         model_from_config = config["model"]
         if model_from_config is None:
@@ -789,277 +166,163 @@ def main(
         raise ConfigError("max_retries configuration missing")
     max_retries = int(max_retries_val)
 
-    if stage_all and (not dry_run):
-        logger.info("Staging all changes")
-        run_git_command(["add", "--all"])
-
-    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")
+    # Get git state and handle hooks
+    git_state = git_validator.get_git_state(
+        stage_all=opts.stage_all,
+        dry_run=opts.dry_run,
+        skip_secret_scan=opts.skip_secret_scan,
+        quiet=opts.quiet,
+        model=model,
+        hint=opts.hint,
+        one_liner=opts.one_liner,
+        infer_scope=opts.infer_scope,
+        verbose=opts.verbose,
+        language=opts.language,
+    )
 
-    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)
+    # No staged changes found
+    if git_state is None:
+        return 0
 
-    if not no_verify and not dry_run:
-        if not run_lefthook_hooks(hook_timeout):
+    # Run pre-commit hooks
+    if not opts.no_verify and not opts.dry_run:
+        if not run_lefthook_hooks(opts.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)
+            return 1
 
-        if not run_pre_commit_hooks(hook_timeout):
+        if not run_pre_commit_hooks(opts.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 = get_staged_status()
-    diff = run_git_command(["diff", "--staged"])
-    diff_stat = " " + run_git_command(["diff", "--stat", "--cached"])
-
-    if not skip_secret_scan:
-        logger.info("Scanning staged changes for potential secrets...")
-        secrets = scan_staged_diff(diff)
-        if secrets:
-            if not quiet:
-                console.print("\n[bold red]⚠️  SECURITY WARNING: Potential secrets detected![/bold red]")
-                console.print("[red]The following sensitive information was found in your staged changes:[/red]\n")
-
-            for secret in secrets:
-                location = f"{secret.file_path}:{secret.line_number}" if secret.line_number else secret.file_path
-                if not quiet:
-                    console.print(f"  • [yellow]{secret.secret_type}[/yellow] in [cyan]{location}[/cyan]")
-                    console.print(f"    Match: [dim]{secret.matched_text}[/dim]\n")
-
-            if not quiet:
-                console.print("\n[bold]Options:[/bold]")
-                console.print("  \\[a] Abort commit (recommended)")
-                console.print("  \\[c] [yellow]Continue anyway[/yellow] (not recommended)")
-                console.print("  \\[r] Remove affected file(s) and continue")
-
-            try:
-                choice = (
-                    click.prompt(
-                        "\nChoose an option",
-                        type=click.Choice(["a", "c", "r"], case_sensitive=False),
-                        default="a",
-                        show_choices=True,
-                        show_default=True,
-                    )
-                    .strip()
-                    .lower()
-                )
-            except (EOFError, KeyboardInterrupt):
-                console.print("\n[red]Aborted by user.[/red]")
-                sys.exit(0)
-
-            if choice == "a":
-                console.print("[yellow]Commit aborted.[/yellow]")
-                sys.exit(0)
-            elif choice == "c":
-                console.print("[bold yellow]⚠️  Continuing with potential secrets in commit...[/bold yellow]")
-                logger.warning("User chose to continue despite detected secrets")
-            elif choice == "r":
-                affected_files = get_affected_files(secrets)
-                for file_path in affected_files:
-                    try:
-                        run_git_command(["reset", "HEAD", file_path])
-                        console.print(f"[green]Unstaged: {file_path}[/green]")
-                    except GitError as e:
-                        console.print(f"[red]Failed to unstage {file_path}: {e}[/red]")
-
-                # Check if there are still staged files
-                remaining_staged = get_staged_files(existing_only=False)
-                if not remaining_staged:
-                    console.print("[yellow]No files remain staged. Commit aborted.[/yellow]")
-                    sys.exit(0)
-
-                console.print(f"[green]Continuing with {len(remaining_staged)} staged file(s)...[/green]")
-                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")
-
-    logger.debug(f"Preprocessing diff ({len(diff)} characters)")
-    if model is None:
-        raise ConfigError("Model must be specified via GAC_MODEL environment variable or --model flag")
-    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
+            return 1
+
+    # Handle secret detection
+    if git_state.has_secrets:
+        secret_decision = git_validator.handle_secret_detection(git_state.secrets, opts.quiet)
+        if secret_decision is None:
+            # User chose to abort
+            return 0
+        if not secret_decision:
+            # Secrets were removed, we need to refresh the git state
+            git_state = git_validator.get_git_state(
+                stage_all=False,
+                dry_run=opts.dry_run,
+                skip_secret_scan=True,  # Skip secret scan this time
+                quiet=opts.quiet,
+                model=model,
+                hint=opts.hint,
+                one_liner=opts.one_liner,
+                infer_scope=opts.infer_scope,
+                verbose=opts.verbose,
+                language=opts.language,
+            )
+            # After removing secret files, no staged changes may remain
+            if git_state is None:
+                return 0
 
-    translate_prefixes_value = config.get("translate_prefixes")
-    translate_prefixes: bool = bool(translate_prefixes_value) if isinstance(translate_prefixes_value, bool) else False
+    # Adjust max_output_tokens for grouped mode
+    if opts.group:
+        num_files = len(git_state.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")
 
-    system_prompt, user_prompt = build_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,
+    # Build prompts
+    prompts = prompt_builder.build_prompts(
+        git_state=git_state,
+        group=opts.group,
+        one_liner=opts.one_liner,
+        hint=opts.hint,
+        infer_scope=opts.infer_scope,
+        verbose=opts.verbose,
+        language=opts.language,
     )
 
-    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,
-        )
+    # Display prompts if requested
+    if opts.show_prompt:
+        prompt_builder.display_prompts(prompts.system_prompt, prompts.user_prompt)
 
-        try:
-            execute_grouped_commits_workflow(
-                system_prompt=system_prompt,
-                user_prompt=user_prompt,
+    try:
+        if opts.group:
+            # Execute grouped workflow
+            return grouped_workflow.execute_workflow(
+                system_prompt=prompts.system_prompt,
+                user_prompt=prompts.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,
-                push=push,
-                show_prompt=show_prompt,
-                hook_timeout=hook_timeout,
-                interactive=interactive,
-                message_only=message_only,
+                require_confirmation=opts.require_confirmation,
+                quiet=opts.quiet,
+                no_verify=opts.no_verify,
+                dry_run=opts.dry_run,
+                push=opts.push,
+                show_prompt=opts.show_prompt,
+                interactive=opts.interactive,
+                message_only=opts.message_only,
+                hook_timeout=opts.hook_timeout,
+                git_state=git_state,
+                hint=opts.hint,
             )
-        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:
-            execute_single_commit_workflow(
-                system_prompt=system_prompt,
-                user_prompt=user_prompt,
+        else:
+            # Build workflow context
+            gen_config = GenerationConfig(
                 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)
-            # Check if this is a Qwen OAuth token expiration
-            elif e.error_type == "authentication" and model.startswith("qwen:"):
-                logger.error(str(e))
-                console.print("[yellow]⚠ Qwen authentication failed[/yellow]")
-                console.print("[cyan]🔐 Starting automatic re-authentication...[/cyan]")
-
-                try:
-                    from gac.oauth import QwenOAuthProvider, TokenStore
-
-                    oauth_provider = QwenOAuthProvider(TokenStore())
-                    oauth_provider.initiate_auth(open_browser=True)
-                    console.print("[green]✓ Re-authentication successful![/green]")
-                    console.print("[cyan]Retrying commit...[/cyan]\n")
+            flags = WorkflowFlags(
+                require_confirmation=opts.require_confirmation,
+                quiet=opts.quiet,
+                no_verify=opts.no_verify,
+                dry_run=opts.dry_run,
+                message_only=opts.message_only,
+                push=opts.push,
+                show_prompt=opts.show_prompt,
+                interactive=opts.interactive,
+                hook_timeout=opts.hook_timeout,
+            )
+            state = WorkflowState(
+                prompts=prompts,
+                git_state=git_state,
+                hint=opts.hint,
+                commit_executor=commit_executor,
+                interactive_mode=interactive_mode,
+            )
+            ctx = WorkflowContext(config=gen_config, flags=flags, state=state)
 
-                    # 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,
-                    )
-                except Exception as auth_error:
-                    console.print(f"[red]Re-authentication error: {auth_error}[/red]")
-                    console.print("[yellow]Run 'gac auth qwen login' to re-authenticate manually.[/yellow]")
-                    sys.exit(1)
-            else:
-                # Non-Claude Code/Qwen error or non-auth error
-                logger.error(str(e))
-                console.print(f"[red]Failed to generate commit message: {str(e)}[/red]")
-                sys.exit(1)
+            # Execute single commit workflow
+            return _execute_single_commit_workflow(ctx)
+    except AIError as e:
+        # Build context for retry
+        gen_config = GenerationConfig(
+            model=model,
+            temperature=temperature,
+            max_output_tokens=max_output_tokens,
+            max_retries=max_retries,
+        )
+        flags = WorkflowFlags(
+            require_confirmation=opts.require_confirmation,
+            quiet=opts.quiet,
+            no_verify=opts.no_verify,
+            dry_run=opts.dry_run,
+            message_only=opts.message_only,
+            push=opts.push,
+            show_prompt=opts.show_prompt,
+            interactive=opts.interactive,
+            hook_timeout=opts.hook_timeout,
+        )
+        state = WorkflowState(
+            prompts=prompts,
+            git_state=git_state,
+            hint=opts.hint,
+            commit_executor=commit_executor,
+            interactive_mode=interactive_mode,
+        )
+        ctx = WorkflowContext(config=gen_config, flags=flags, state=state)
+        return handle_oauth_retry(e=e, ctx=ctx)
 
 
 if __name__ == "__main__":
-    main()
+    raise SystemExit(main(CLIOptions()))