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

gac/language_cli.py

@@ -1,16 +1,165 @@
 """CLI for selecting commit message language interactively."""
 
+import os
+import unicodedata
 from pathlib import Path
 
 import click
 import questionary
-from dotenv import set_key
+from dotenv import load_dotenv, set_key
 
 from gac.constants import Languages
 
 GAC_ENV_PATH = Path.home() / ".gac.env"
 
 
+def should_show_rtl_warning() -> bool:
+    """Check if RTL warning should be shown based on saved preference.
+
+    Returns:
+        True if warning should be shown, False if user previously confirmed
+    """
+    # Load the current config to check RTL confirmation
+    if GAC_ENV_PATH.exists():
+        load_dotenv(GAC_ENV_PATH)
+        rtl_confirmed = os.getenv("GAC_RTL_CONFIRMED", "false").lower() in ("true", "1", "yes", "on")
+        return not rtl_confirmed
+    return True  # Show warning if no config exists
+
+
+def is_rtl_text(text: str) -> bool:
+    """Detect if text contains RTL characters or is a known RTL language.
+
+    Args:
+        text: Text to analyze
+
+    Returns:
+        True if text contains RTL script characters or is RTL language
+    """
+    # Known RTL language names (case insensitive)
+    rtl_languages = {
+        "arabic",
+        "ar",
+        "العربية",
+        "hebrew",
+        "he",
+        "עברית",
+        "persian",
+        "farsi",
+        "fa",
+        "urdu",
+        "ur",
+        "اردو",
+        "pashto",
+        "ps",
+        "kurdish",
+        "ku",
+        "کوردی",
+        "yiddish",
+        "yi",
+        "ייִדיש",
+    }
+
+    # Check if it's a known RTL language name or code (case insensitive)
+    if text.lower().strip() in rtl_languages:
+        return True
+
+    rtl_scripts = {"Arabic", "Hebrew", "Thaana", "Nko", "Syriac", "Mandeic", "Samaritan", "Mongolian", "Phags-Pa"}
+
+    for char in text:
+        if unicodedata.name(char, "").startswith(("ARABIC", "HEBREW")):
+            return True
+        script = unicodedata.name(char, "").split()[0] if unicodedata.name(char, "") else ""
+        if script in rtl_scripts:
+            return True
+    return False
+
+
+def center_text(text: str, width: int = 80) -> str:
+    """Center text within specified width, handling display width properly.
+
+    Args:
+        text: Text to center
+        width: Terminal width to center within (default 80)
+
+    Returns:
+        Centered text with proper padding
+    """
+    import unicodedata
+
+    def get_display_width(s: str) -> int:
+        """Get the display width of a string, accounting for wide characters."""
+        width = 0
+        for char in s:
+            # East Asian characters are typically 2 columns wide
+            if unicodedata.east_asian_width(char) in ("W", "F"):
+                width += 2
+            else:
+                width += 1
+        return width
+
+    # Handle multi-line text
+    lines = text.split("\n")
+    centered_lines = []
+
+    for line in lines:
+        # Strip existing whitespace to avoid double padding
+        stripped_line = line.strip()
+        if stripped_line:
+            # Calculate padding using display width for accurate centering
+            display_width = get_display_width(stripped_line)
+            padding = max(0, (width - display_width) // 2)
+            centered_line = " " * padding + stripped_line
+            centered_lines.append(centered_line)
+        else:
+            centered_lines.append("")
+
+    return "\n".join(centered_lines)
+
+
+def get_terminal_width() -> int:
+    """Get the current terminal width.
+
+    Returns:
+        Terminal width in characters, or default if can't be determined
+    """
+    try:
+        import shutil
+
+        return shutil.get_terminal_size().columns
+    except (OSError, AttributeError):
+        return 80  # Fallback to 80 columns
+
+
+def show_rtl_warning(language_name: str) -> bool:
+    """Show RTL language warning and ask for confirmation.
+
+    Args:
+        language_name: Name of the RTL language
+
+    Returns:
+        True if user wants to proceed, False if they cancel
+    """
+    terminal_width = get_terminal_width()
+
+    # Center just the title
+    title = center_text("⚠️  RTL Language Detected", terminal_width)
+
+    click.echo()
+    click.echo(click.style(title, fg="yellow", bold=True))
+    click.echo()
+    click.echo("Right-to-left (RTL) languages may not display correctly in gac due to terminal limitations.")
+    click.echo("However, the commit messages will work fine and should be readable in Git clients")
+    click.echo("that properly support RTL text (like most web interfaces and modern tools).\n")
+
+    proceed = questionary.confirm("Do you want to proceed anyway?").ask()
+    if proceed:
+        # Remember that user has confirmed RTL acceptance
+        set_key(str(GAC_ENV_PATH), "GAC_RTL_CONFIRMED", "true")
+        click.echo("✓ RTL preference saved - you won't see this warning again")
+    return proceed if proceed is not None else False
+
+
 @click.command()
 def language() -> None:
     """Set the language for commit messages interactively."""
@@ -18,7 +167,7 @@ def language() -> None:
 
     display_names = [lang[0] for lang in Languages.LANGUAGES]
     selection = questionary.select(
-        "Choose your language:", choices=display_names, use_shortcuts=True, use_arrow_keys=True
+        "Choose your language:", choices=display_names, use_shortcuts=True, use_arrow_keys=True, use_jk_keys=False
     ).ask()
 
     if not selection:
@@ -47,10 +196,29 @@ def language() -> None:
             click.echo("No language entered. Cancelled.")
             return
         language_value = custom_language.strip()
+
+        # Check if the custom language appears to be RTL
+        if is_rtl_text(language_value):
+            if not should_show_rtl_warning():
+                click.echo(f"\nℹ️  Using RTL language {language_value} (RTL warning previously confirmed)")
+            else:
+                if not show_rtl_warning(language_value):
+                    click.echo("Language selection cancelled.")
+                    return
+
     else:
         # Find the English name for the selected language
         language_value = next(lang[1] for lang in Languages.LANGUAGES if lang[0] == selection)
 
+        # Check if predefined language is RTL
+        if is_rtl_text(language_value):
+            if not should_show_rtl_warning():
+                click.echo(f"\nℹ️  Using RTL language {language_value} (RTL warning previously confirmed)")
+            else:
+                if not show_rtl_warning(language_value):
+                    click.echo("Language selection cancelled.")
+                    return
+
     # Ask about prefix translation
     click.echo()  # Blank line for spacing
     prefix_choice = questionary.select(

gac/main.py

@@ -87,7 +87,7 @@ def _parse_model_identifier(model: str) -> tuple[str, str]:
     if not provider or not model_name:
         message = (
             f"Invalid model format: '{model}'. Both provider and model name are required "
-            "(example: 'anthropic:claude-3-5-haiku-latest')."
+            "(example: 'anthropic:claude-haiku-4-5')."
         )
         logger.error(message)
         console.print(f"[red]{message}[/red]")
@@ -134,6 +134,7 @@ def execute_grouped_commits_workflow(
     dry_run: bool,
     push: bool,
     show_prompt: bool,
+    hook_timeout: int = 120,
 ) -> None:
     """Execute the grouped commits workflow."""
     import json
@@ -339,7 +340,7 @@ def execute_grouped_commits_workflow(
                     try:
                         for file_path in commit["files"]:
                             run_git_command(["add", "-A", file_path])
-                        execute_commit(commit["message"], no_verify)
+                        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]")
@@ -389,6 +390,7 @@ def execute_single_commit_workflow(
     dry_run: bool,
     push: bool,
     show_prompt: bool,
+    hook_timeout: int = 120,
 ) -> None:
     if show_prompt:
         full_prompt = f"SYSTEM PROMPT:\n{system_prompt}\n\nUSER PROMPT:\n{user_prompt}"
@@ -446,7 +448,7 @@ def execute_single_commit_workflow(
         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)
+        execute_commit(commit_message, no_verify, hook_timeout)
 
     if push:
         try:
@@ -497,6 +499,7 @@ def main(
     no_verify: bool = False,
     skip_secret_scan: bool = False,
     language: str | None = None,
+    hook_timeout: int = 120,
 ) -> None:
     """Main application logic for gac."""
     try:
@@ -549,12 +552,12 @@ def main(
         sys.exit(0)
 
     if not no_verify and not dry_run:
-        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)
 
-        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)
@@ -687,6 +690,7 @@ def main(
                 dry_run=dry_run,
                 push=push,
                 show_prompt=show_prompt,
+                hook_timeout=hook_timeout,
             )
         except AIError as e:
             logger.error(str(e))
@@ -707,11 +711,56 @@ def main(
                 dry_run=dry_run,
                 push=push,
                 show_prompt=show_prompt,
+                hook_timeout=hook_timeout,
             )
         except AIError as e:
-            logger.error(str(e))
-            console.print(f"[red]Failed to generate commit message: {str(e)}[/red]")
-            sys.exit(1)
+            # 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,
+                            push=push,
+                            show_prompt=show_prompt,
+                            hook_timeout=hook_timeout,
+                        )
+                        return  # Success!
+                    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:
+                # 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)
 
 
 if __name__ == "__main__":

gac/oauth/__init__.py

@@ -0,0 +1 @@
+"""OAuth authentication utilities for GAC."""