gac 2.3.0__tar.gz → 2.7.5__tar.gz

{gac-2.3.0 → gac-2.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 2.3.0
+Version: 2.7.5
 Summary: LLM-powered Git commit message generator with multi-provider support
 Project-URL: Homepage, https://github.com/cellwebb/gac
 Project-URL: Documentation, https://github.com/cellwebb/gac#readme
@@ -41,6 +41,9 @@ Requires-Dist: twine; extra == 'dev'
 Description-Content-Type: text/markdown
 
 <!-- markdownlint-disable MD013 -->
+<!-- markdownlint-disable MD033 MD036 -->
+
+<div align="center">
 
 # 🚀 Git Auto Commit (gac)
 
@@ -50,9 +53,11 @@ Description-Content-Type: text/markdown
 [![codecov](https://codecov.io/gh/cellwebb/gac/branch/main/graph/badge.svg)](https://app.codecov.io/gh/cellwebb/gac)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![mypy](https://img.shields.io/badge/mypy-checked-blue.svg)](https://mypy-lang.org/)
-[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](docs/CONTRIBUTING.md)
+[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](docs/en/CONTRIBUTING.md)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
+**English** | [简体中文](docs/zh-CN/README.md) | [繁體中文](docs/zh-TW/README.md) | [日本語](docs/ja/README.md) | [한국어](docs/ko/README.md) | [हिन्दी](docs/hi/README.md) | [Tiếng Việt](docs/vi/README.md) | [Français](docs/fr/README.md) | [Русский](docs/ru/README.md) | [Español](docs/es/README.md) | [Português](docs/pt/README.md) | [Norsk](docs/no/README.md) | [Svenska](docs/sv/README.md) | [Deutsch](docs/de/README.md) | [Nederlands](docs/nl/README.md) | [Italiano](docs/it/README.md)
+
 **LLM-powered commit messages that understand your code!**
 
 **Automate your commits!** Replace `git commit -m "..."` with `gac` for contextual, well-formatted commit messages generated by large language models!
@@ -67,12 +72,16 @@ Intelligent, contextual messages that explain the **why** behind your changes:
 
 ---
 
+</div>
+
+<!-- markdownlint-enable MD033 MD036 -->
+
 ## Quick Start
 
 ### Use gac without installing
 
 ```bash
-uvx gac init  # Configure your LLM provider
+uvx gac init   # Configure your provider, model, and language
 uvx gac  # Generate and commit with LLM
 ```
 
@@ -98,9 +107,10 @@ uv tool upgrade gac
 
 ### 🌐 **Supported Providers**
 
-- **Anthropic** • **Cerebras** • **Chutes.ai** • **DeepSeek** • **Fireworks**
-- **Gemini** • **Groq** • **LM Studio** • **MiniMax** • **Mistral** • **Ollama** • **OpenAI**
-- **OpenRouter** • **Streamlake** • **Synthetic.new** • **Together AI**
+- **Anthropic** • **Cerebras** • **Chutes.ai** • **Claude Code**
+- **DeepSeek** • **Fireworks** • **Gemini** • **Groq** • **LM Studio**
+- **MiniMax** • **Mistral** • **Ollama** • **OpenAI** • **OpenRouter**
+- **Streamlake** • **Synthetic.new** • **Together AI**
 - **Z.AI** • **Z.AI Coding** • **Custom Endpoints (Anthropic/OpenAI)**
 
 ### 🧠 **Smart LLM Analysis**
@@ -121,7 +131,7 @@ uv tool upgrade gac
 - **25+ languages**: Generate commit messages in English, Chinese, Japanese, Korean, Spanish, French, German, and 20+ more languages
 - **Flexible translation**: Choose to keep conventional commit prefixes in English for tool compatibility, or fully translate them
 - **Multiple workflows**: Set a default language with `gac language`, or use `-l <language>` flag for one-time overrides
-- **Native script support**: Full support for non-Latin scripts including CJK, Cyrillic, Arabic, and more
+- **Native script support**: Full support for non-Latin scripts including CJK, Cyrillic, Thai, and more
 
 ### 💻 **Developer Experience**
 
@@ -220,6 +230,8 @@ The edit feature (`e`) provides rich in-place terminal editing, allowing you to:
 
 Run `gac init` to configure your provider interactively, or set environment variables:
 
+Need to change providers or models later without touching language settings? Use `gac model` for a streamlined flow that skips the language prompts.
+
 ```bash
 # Example configuration
 GAC_MODEL=anthropic:your-model-name
@@ -231,16 +243,24 @@ See `.gac.env.example` for all available options.
 
 **Want commit messages in another language?** Run `gac language` to select from 25+ languages including Español, Français, 日本語, and more.
 
-**Want to customize commit message style?** See [docs/CUSTOM_SYSTEM_PROMPTS.md](docs/CUSTOM_SYSTEM_PROMPTS.md) for guidance on writing custom system prompts.
+**Want to customize commit message style?** See [docs/CUSTOM_SYSTEM_PROMPTS.md](docs/en/CUSTOM_SYSTEM_PROMPTS.md) for guidance on writing custom system prompts.
+
+---
+
+## Project Analytics
+
+📊 **[View live usage analytics and statistics →](https://clickpy.clickhouse.com/dashboard/gac)**
+
+Track real-time installation metrics and package download statistics.
 
 ---
 
 ## Getting Help
 
-- **Full documentation**: [USAGE.md](USAGE.md) - Complete CLI reference
-- **Custom prompts**: [CUSTOM_SYSTEM_PROMPTS.md](docs/CUSTOM_SYSTEM_PROMPTS.md) - Customize commit message style
-- **Troubleshooting**: [TROUBLESHOOTING.md](docs/TROUBLESHOOTING.md) - Common issues and solutions
-- **Contributing**: [CONTRIBUTING.md](docs/CONTRIBUTING.md) - Development setup and guidelines
+- **Full documentation**: [docs/USAGE.md](docs/en/USAGE.md) - Complete CLI reference
+- **Custom prompts**: [docs/CUSTOM_SYSTEM_PROMPTS.md](docs/en/CUSTOM_SYSTEM_PROMPTS.md) - Customize commit message style
+- **Troubleshooting**: [docs/TROUBLESHOOTING.md](docs/en/TROUBLESHOOTING.md) - Common issues and solutions
+- **Contributing**: [docs/CONTRIBUTING.md](docs/en/CONTRIBUTING.md) - Development setup and guidelines
 
 ---
 
@@ -250,7 +270,7 @@ See `.gac.env.example` for all available options.
 
 Made with ❤️ for developers who want better commit messages
 
-[⭐ Star us on GitHub](https://github.com/cellwebb/gac) • [🐛 Report issues](https://github.com/cellwebb/gac/issues) • [📖 Full docs](USAGE.md)
+[⭐ Star us on GitHub](https://github.com/cellwebb/gac) • [🐛 Report issues](https://github.com/cellwebb/gac/issues) • [📖 Full docs](docs/en/USAGE.md)
 
 </div>
 

{gac-2.3.0 → gac-2.7.5}/README.md

@@ -1,4 +1,7 @@
 <!-- markdownlint-disable MD013 -->
+<!-- markdownlint-disable MD033 MD036 -->
+
+<div align="center">
 
 # 🚀 Git Auto Commit (gac)
 
@@ -8,9 +11,11 @@
 [![codecov](https://codecov.io/gh/cellwebb/gac/branch/main/graph/badge.svg)](https://app.codecov.io/gh/cellwebb/gac)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![mypy](https://img.shields.io/badge/mypy-checked-blue.svg)](https://mypy-lang.org/)
-[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](docs/CONTRIBUTING.md)
+[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](docs/en/CONTRIBUTING.md)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
+**English** | [简体中文](docs/zh-CN/README.md) | [繁體中文](docs/zh-TW/README.md) | [日本語](docs/ja/README.md) | [한국어](docs/ko/README.md) | [हिन्दी](docs/hi/README.md) | [Tiếng Việt](docs/vi/README.md) | [Français](docs/fr/README.md) | [Русский](docs/ru/README.md) | [Español](docs/es/README.md) | [Português](docs/pt/README.md) | [Norsk](docs/no/README.md) | [Svenska](docs/sv/README.md) | [Deutsch](docs/de/README.md) | [Nederlands](docs/nl/README.md) | [Italiano](docs/it/README.md)
+
 **LLM-powered commit messages that understand your code!**
 
 **Automate your commits!** Replace `git commit -m "..."` with `gac` for contextual, well-formatted commit messages generated by large language models!
@@ -25,12 +30,16 @@ Intelligent, contextual messages that explain the **why** behind your changes:
 
 ---
 
+</div>
+
+<!-- markdownlint-enable MD033 MD036 -->
+
 ## Quick Start
 
 ### Use gac without installing
 
 ```bash
-uvx gac init  # Configure your LLM provider
+uvx gac init   # Configure your provider, model, and language
 uvx gac  # Generate and commit with LLM
 ```
 
@@ -56,9 +65,10 @@ uv tool upgrade gac
 
 ### 🌐 **Supported Providers**
 
-- **Anthropic** • **Cerebras** • **Chutes.ai** • **DeepSeek** • **Fireworks**
-- **Gemini** • **Groq** • **LM Studio** • **MiniMax** • **Mistral** • **Ollama** • **OpenAI**
-- **OpenRouter** • **Streamlake** • **Synthetic.new** • **Together AI**
+- **Anthropic** • **Cerebras** • **Chutes.ai** • **Claude Code**
+- **DeepSeek** • **Fireworks** • **Gemini** • **Groq** • **LM Studio**
+- **MiniMax** • **Mistral** • **Ollama** • **OpenAI** • **OpenRouter**
+- **Streamlake** • **Synthetic.new** • **Together AI**
 - **Z.AI** • **Z.AI Coding** • **Custom Endpoints (Anthropic/OpenAI)**
 
 ### 🧠 **Smart LLM Analysis**
@@ -79,7 +89,7 @@ uv tool upgrade gac
 - **25+ languages**: Generate commit messages in English, Chinese, Japanese, Korean, Spanish, French, German, and 20+ more languages
 - **Flexible translation**: Choose to keep conventional commit prefixes in English for tool compatibility, or fully translate them
 - **Multiple workflows**: Set a default language with `gac language`, or use `-l <language>` flag for one-time overrides
-- **Native script support**: Full support for non-Latin scripts including CJK, Cyrillic, Arabic, and more
+- **Native script support**: Full support for non-Latin scripts including CJK, Cyrillic, Thai, and more
 
 ### 💻 **Developer Experience**
 
@@ -178,6 +188,8 @@ The edit feature (`e`) provides rich in-place terminal editing, allowing you to:
 
 Run `gac init` to configure your provider interactively, or set environment variables:
 
+Need to change providers or models later without touching language settings? Use `gac model` for a streamlined flow that skips the language prompts.
+
 ```bash
 # Example configuration
 GAC_MODEL=anthropic:your-model-name
@@ -189,16 +201,24 @@ See `.gac.env.example` for all available options.
 
 **Want commit messages in another language?** Run `gac language` to select from 25+ languages including Español, Français, 日本語, and more.
 
-**Want to customize commit message style?** See [docs/CUSTOM_SYSTEM_PROMPTS.md](docs/CUSTOM_SYSTEM_PROMPTS.md) for guidance on writing custom system prompts.
+**Want to customize commit message style?** See [docs/CUSTOM_SYSTEM_PROMPTS.md](docs/en/CUSTOM_SYSTEM_PROMPTS.md) for guidance on writing custom system prompts.
+
+---
+
+## Project Analytics
+
+📊 **[View live usage analytics and statistics →](https://clickpy.clickhouse.com/dashboard/gac)**
+
+Track real-time installation metrics and package download statistics.
 
 ---
 
 ## Getting Help
 
-- **Full documentation**: [USAGE.md](USAGE.md) - Complete CLI reference
-- **Custom prompts**: [CUSTOM_SYSTEM_PROMPTS.md](docs/CUSTOM_SYSTEM_PROMPTS.md) - Customize commit message style
-- **Troubleshooting**: [TROUBLESHOOTING.md](docs/TROUBLESHOOTING.md) - Common issues and solutions
-- **Contributing**: [CONTRIBUTING.md](docs/CONTRIBUTING.md) - Development setup and guidelines
+- **Full documentation**: [docs/USAGE.md](docs/en/USAGE.md) - Complete CLI reference
+- **Custom prompts**: [docs/CUSTOM_SYSTEM_PROMPTS.md](docs/en/CUSTOM_SYSTEM_PROMPTS.md) - Customize commit message style
+- **Troubleshooting**: [docs/TROUBLESHOOTING.md](docs/en/TROUBLESHOOTING.md) - Common issues and solutions
+- **Contributing**: [docs/CONTRIBUTING.md](docs/en/CONTRIBUTING.md) - Development setup and guidelines
 
 ---
 
@@ -208,7 +228,7 @@ See `.gac.env.example` for all available options.
 
 Made with ❤️ for developers who want better commit messages
 
-[⭐ Star us on GitHub](https://github.com/cellwebb/gac) • [🐛 Report issues](https://github.com/cellwebb/gac/issues) • [📖 Full docs](USAGE.md)
+[⭐ Star us on GitHub](https://github.com/cellwebb/gac) • [🐛 Report issues](https://github.com/cellwebb/gac/issues) • [📖 Full docs](docs/en/USAGE.md)
 
 </div>
 

{gac-2.3.0 → gac-2.7.5}/src/gac/__version__.py

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

{gac-2.3.0 → gac-2.7.5}/src/gac/ai.py

@@ -13,6 +13,7 @@ from gac.providers import (
     call_anthropic_api,
     call_cerebras_api,
     call_chutes_api,
+    call_claude_code_api,
     call_custom_anthropic_api,
     call_custom_openai_api,
     call_deepseek_api,
@@ -48,7 +49,7 @@ def generate_commit_message(
     """Generate a commit message using direct API calls to AI providers.
 
     Args:
-        model: The model to use in provider:model_name format (e.g., 'anthropic:claude-3-5-haiku-latest')
+        model: The model to use in provider:model_name format (e.g., 'anthropic:claude-haiku-4-5')
         prompt: Either a string prompt (for backward compatibility) or tuple of (system_prompt, user_prompt)
         temperature: Controls randomness (0.0-1.0), lower values are more deterministic
         max_tokens: Maximum tokens in the response
@@ -62,7 +63,7 @@ def generate_commit_message(
         AIError: If generation fails after max_retries attempts
 
     Example:
-        >>> model = "anthropic:claude-3-5-haiku-latest"
+        >>> model = "anthropic:claude-haiku-4-5"
         >>> system_prompt, user_prompt = build_prompt("On branch main", "diff --git a/README.md b/README.md")
         >>> generate_commit_message(model, (system_prompt, user_prompt))
         'docs: Update README with installation instructions'
@@ -88,6 +89,7 @@ def generate_commit_message(
     provider_funcs = {
         "anthropic": call_anthropic_api,
         "cerebras": call_cerebras_api,
+        "claude-code": call_claude_code_api,
         "chutes": call_chutes_api,
         "custom-anthropic": call_custom_anthropic_api,
         "custom-openai": call_custom_openai_api,

{gac-2.3.0 → gac-2.7.5}/src/gac/ai_utils.py

@@ -4,6 +4,7 @@ This module provides utility functions that support the AI provider implementati
 """
 
 import logging
+import os
 import time
 from functools import lru_cache
 from typing import Any
@@ -11,23 +12,34 @@ from typing import Any
 import tiktoken
 from halo import Halo
 
-from gac.constants import Utility
+from gac.constants import EnvDefaults, Utility
 from gac.errors import AIError
 
 logger = logging.getLogger(__name__)
 
 
+@lru_cache(maxsize=1)
+def _should_skip_tiktoken_counting() -> bool:
+    """Return True when token counting should avoid tiktoken calls entirely."""
+    value = os.getenv("GAC_NO_TIKTOKEN", str(EnvDefaults.NO_TIKTOKEN))
+    return value.lower() in ("true", "1", "yes", "on")
+
+
 def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: str) -> int:
     """Count tokens in content using the model's tokenizer."""
     text = extract_text_content(content)
     if not text:
         return 0
 
+    if _should_skip_tiktoken_counting():
+        return len(text) // 4
+
     try:
         encoding = get_encoding(model)
         return len(encoding.encode(text))
     except Exception as e:
         logger.error(f"Error counting tokens: {e}")
+        # Fallback to rough estimation (4 chars per token on average)
         return len(text) // 4
 
 
@@ -45,10 +57,18 @@ def extract_text_content(content: str | list[dict[str, str]] | dict[str, Any]) -
 @lru_cache(maxsize=1)
 def get_encoding(model: str) -> tiktoken.Encoding:
     """Get the appropriate encoding for a given model."""
-    model_name = model.split(":")[-1] if ":" in model else model
+    provider, model_name = model.split(":", 1) if ":" in model else (None, model)
+
+    if provider != "openai":
+        return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
+
     try:
         return tiktoken.encoding_for_model(model_name)
     except KeyError:
+        # Fall back to default encoding if model not found
+        return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
+    except Exception:
+        # If there are any network/SSL issues, fall back to default encoding
         return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
 
 
@@ -98,6 +118,7 @@ def generate_with_retries(
         "anthropic",
         "cerebras",
         "chutes",
+        "claude-code",
         "deepseek",
         "fireworks",
         "gemini",

gac-2.7.5/src/gac/auth_cli.py

@@ -0,0 +1,69 @@
+"""CLI for authenticating Claude Code OAuth tokens.
+
+Provides a command to authenticate and re-authenticate Claude Code subscriptions.
+"""
+
+import logging
+
+import click
+
+from gac.oauth.claude_code import authenticate_and_save, load_stored_token
+from gac.utils import setup_logging
+
+logger = logging.getLogger(__name__)
+
+
+@click.command()
+@click.option(
+    "--quiet",
+    "-q",
+    is_flag=True,
+    help="Suppress non-error output",
+)
+@click.option(
+    "--log-level",
+    default="INFO",
+    type=click.Choice(["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"], case_sensitive=False),
+    help="Set log level (default: INFO)",
+)
+def auth(quiet: bool = False, log_level: str = "INFO") -> None:
+    """Authenticate Claude Code OAuth token.
+
+    This command allows you to authenticate or re-authenticate your
+    Claude Code OAuth token when it expires or you want to refresh it.
+    It opens a browser window for the OAuth flow and saves the token
+    to ~/.gac.env.
+
+    The token is used by the Claude Code provider to access your
+    Claude Code subscription instead of requiring an Anthropic API key.
+    """
+    # Setup logging
+    if quiet:
+        effective_log_level = "ERROR"
+    else:
+        effective_log_level = log_level
+    setup_logging(effective_log_level)
+
+    # Check if there's an existing token
+    existing_token = load_stored_token()
+    if existing_token and not quiet:
+        click.echo("✓ Found existing Claude Code access token.")
+        click.echo()
+
+    if not quiet:
+        click.echo("🔐 Starting Claude Code OAuth authentication...")
+        click.echo("   Your browser will open automatically")
+        click.echo("   (Waiting up to 3 minutes for callback)")
+        click.echo()
+
+    # Perform OAuth authentication
+    success = authenticate_and_save(quiet=quiet)
+
+    if success:
+        if not quiet:
+            click.echo("✅ Claude Code authentication completed successfully!")
+            click.echo("   Your new token has been saved and is ready to use.")
+    else:
+        click.echo("❌ Claude Code authentication failed.")
+        click.echo("   Please try again or check your network connection.")
+        raise click.ClickException("Claude Code authentication failed")

{gac-2.3.0 → gac-2.7.5}/src/gac/cli.py

@@ -11,12 +11,14 @@ import sys
 import click
 
 from gac import __version__
+from gac.auth_cli import auth as auth_cli
 from gac.config import load_config
 from gac.config_cli import config as config_cli
 from gac.constants import Languages, Logging
 from gac.diff_cli import diff as diff_cli
 from gac.errors import handle_error
 from gac.init_cli import init as init_cli
+from gac.init_cli import model as model_cli
 from gac.language_cli import language as language_cli
 from gac.main import main
 from gac.utils import setup_logging
@@ -65,6 +67,12 @@ logger = logging.getLogger(__name__)
 # Advanced options
 @click.option("--no-verify", is_flag=True, help="Skip pre-commit and lefthook hooks when committing")
 @click.option("--skip-secret-scan", is_flag=True, help="Skip security scan for secrets in staged changes")
+@click.option(
+    "--hook-timeout",
+    type=int,
+    default=0,
+    help="Timeout for pre-commit and lefthook hooks in seconds (0 to use configuration)",
+)
 # Other options
 @click.option("--version", is_flag=True, help="Show the version of the Git Auto Commit (gac) tool")
 @click.pass_context
@@ -87,6 +95,7 @@ def cli(
     verbose: bool = False,
     no_verify: bool = False,
     skip_secret_scan: bool = False,
+    hook_timeout: int = 0,
 ) -> None:
     """Git Auto Commit - Generate commit messages with AI."""
     if ctx.invoked_subcommand is None:
@@ -125,6 +134,7 @@ def cli(
                 no_verify=no_verify,
                 skip_secret_scan=skip_secret_scan or bool(config.get("skip_secret_scan", False)),
                 language=resolved_language,
+                hook_timeout=hook_timeout if hook_timeout > 0 else int(config.get("hook_timeout", 120) or 120),
             )
         except Exception as e:
             handle_error(e, exit_program=True)
@@ -150,13 +160,16 @@ def cli(
             "verbose": verbose,
             "no_verify": no_verify,
             "skip_secret_scan": skip_secret_scan,
+            "hook_timeout": hook_timeout,
         }
 
 
+cli.add_command(auth_cli)
 cli.add_command(config_cli)
+cli.add_command(diff_cli)
 cli.add_command(init_cli)
 cli.add_command(language_cli)
-cli.add_command(diff_cli)
+cli.add_command(model_cli)
 
 
 @click.command(context_settings=language_cli.context_settings)

{gac-2.3.0 → gac-2.7.5}/src/gac/config.py

@@ -37,10 +37,13 @@ def load_config() -> dict[str, str | int | float | bool | None]:
         in ("true", "1", "yes", "on"),
         "skip_secret_scan": os.getenv("GAC_SKIP_SECRET_SCAN", str(EnvDefaults.SKIP_SECRET_SCAN)).lower()
         in ("true", "1", "yes", "on"),
+        "no_tiktoken": os.getenv("GAC_NO_TIKTOKEN", str(EnvDefaults.NO_TIKTOKEN)).lower() in ("true", "1", "yes", "on"),
         "verbose": os.getenv("GAC_VERBOSE", str(EnvDefaults.VERBOSE)).lower() in ("true", "1", "yes", "on"),
         "system_prompt_path": os.getenv("GAC_SYSTEM_PROMPT_PATH"),
         "language": os.getenv("GAC_LANGUAGE"),
         "translate_prefixes": os.getenv("GAC_TRANSLATE_PREFIXES", "false").lower() in ("true", "1", "yes", "on"),
+        "rtl_confirmed": os.getenv("GAC_RTL_CONFIRMED", "false").lower() in ("true", "1", "yes", "on"),
+        "hook_timeout": int(os.getenv("GAC_HOOK_TIMEOUT", EnvDefaults.HOOK_TIMEOUT)),
     }
 
     return config

{gac-2.3.0 → gac-2.7.5}/src/gac/constants.py

@@ -25,6 +25,8 @@ class EnvDefaults:
     ALWAYS_INCLUDE_SCOPE: bool = False
     SKIP_SECRET_SCAN: bool = False
     VERBOSE: bool = False
+    NO_TIKTOKEN: bool = False
+    HOOK_TIMEOUT: int = 120  # Timeout for pre-commit and lefthook hooks in seconds
 
 
 class Logging:

{gac-2.3.0 → gac-2.7.5}/src/gac/git.py

@@ -14,6 +14,63 @@ from gac.utils import run_subprocess
 logger = logging.getLogger(__name__)
 
 
+def run_subprocess_with_encoding_fallback(
+    command: list[str], silent: bool = False, timeout: int = 60
+) -> subprocess.CompletedProcess:
+    """Run subprocess with encoding fallback, returning full CompletedProcess object.
+
+    This is used for cases where we need both stdout and stderr separately,
+    like pre-commit and lefthook hook execution.
+
+    Args:
+        command: List of command arguments
+        silent: If True, suppress debug logging
+        timeout: Command timeout in seconds
+
+    Returns:
+        CompletedProcess object with stdout, stderr, and returncode
+    """
+    from gac.utils import get_safe_encodings
+
+    encodings = get_safe_encodings()
+    last_exception: Exception | None = None
+
+    for encoding in encodings:
+        try:
+            if not silent:
+                logger.debug(f"Running command: {' '.join(command)} (encoding: {encoding})")
+
+            result = subprocess.run(
+                command,
+                capture_output=True,
+                text=True,
+                check=False,
+                timeout=timeout,
+                encoding=encoding,
+                errors="replace",
+            )
+            return result
+        except UnicodeError as e:
+            last_exception = e
+            if not silent:
+                logger.debug(f"Failed to decode with {encoding}: {e}")
+            continue
+        except subprocess.TimeoutExpired:
+            raise
+        except Exception as e:
+            if not silent:
+                logger.debug(f"Command error: {e}")
+            # Try next encoding for non-timeout errors
+            last_exception = e
+            continue
+
+    # If we get here, all encodings failed
+    if last_exception:
+        raise subprocess.CalledProcessError(1, command, "", f"Encoding error: {last_exception}") from last_exception
+    else:
+        raise subprocess.CalledProcessError(1, command, "", "All encoding attempts failed")
+
+
 def run_git_command(args: list[str], silent: bool = False, timeout: int = 30) -> str:
     """Run a git command and return the output."""
     command = ["git"] + args
@@ -132,23 +189,23 @@ def get_diff(staged: bool = True, color: bool = True, commit1: str | None = None
 
 def get_repo_root() -> str:
     """Get absolute path of repository root."""
-    result = subprocess.check_output(["git", "rev-parse", "--show-toplevel"])
-    return result.decode().strip()
+    result = run_git_command(["rev-parse", "--show-toplevel"])
+    return result
 
 
 def get_current_branch() -> str:
     """Get name of current git branch."""
-    result = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
-    return result.decode().strip()
+    result = run_git_command(["rev-parse", "--abbrev-ref", "HEAD"])
+    return result
 
 
 def get_commit_hash() -> str:
     """Get SHA-1 hash of current commit."""
-    result = subprocess.check_output(["git", "rev-parse", "HEAD"])
-    return result.decode().strip()
+    result = run_git_command(["rev-parse", "HEAD"])
+    return result
 
 
-def run_pre_commit_hooks() -> bool:
+def run_pre_commit_hooks(hook_timeout: int = 120) -> bool:
     """Run pre-commit hooks if they exist.
 
     Returns:
@@ -168,9 +225,9 @@ def run_pre_commit_hooks() -> bool:
             return True
 
         # Run pre-commit hooks on staged files
-        logger.info("Running pre-commit hooks...")
+        logger.info(f"Running pre-commit hooks with {hook_timeout}s timeout...")
         # Run pre-commit and capture both stdout and stderr
-        result = subprocess.run(["pre-commit", "run"], capture_output=True, text=True, check=False)
+        result = run_subprocess_with_encoding_fallback(["pre-commit", "run"], timeout=hook_timeout)
 
         if result.returncode == 0:
             # All hooks passed
@@ -195,7 +252,7 @@ def run_pre_commit_hooks() -> bool:
         return True
 
 
-def run_lefthook_hooks() -> bool:
+def run_lefthook_hooks(hook_timeout: int = 120) -> bool:
     """Run Lefthook hooks if they exist.
 
     Returns:
@@ -218,9 +275,9 @@ def run_lefthook_hooks() -> bool:
             return True
 
         # Run lefthook hooks on staged files
-        logger.info("Running Lefthook hooks...")
+        logger.info(f"Running Lefthook hooks with {hook_timeout}s timeout...")
         # Run lefthook and capture both stdout and stderr
-        result = subprocess.run(["lefthook", "run", "pre-commit"], capture_output=True, text=True, check=False)
+        result = run_subprocess_with_encoding_fallback(["lefthook", "run", "pre-commit"], timeout=hook_timeout)
 
         if result.returncode == 0:
             # All hooks passed