shotgun-sh 0.1.14__py3-none-any.whl → 0.2.11__py3-none-any.whl

shotgun/codebase/core/ingestor.py

@@ -1,5 +1,6 @@
 """Kuzu graph ingestor for building code knowledge graphs."""
 
+import asyncio
 import hashlib
 import os
 import time
@@ -8,6 +9,7 @@ from collections import defaultdict
 from pathlib import Path
 from typing import Any
 
+import aiofiles
 import kuzu
 from tree_sitter import Node, Parser, QueryCursor
 
@@ -18,15 +20,12 @@ from shotgun.logging_config import get_logger
 logger = get_logger(__name__)
 
 
-# Default ignore patterns
-IGNORE_PATTERNS = {
+# Directories that should never be traversed during indexing
+BASE_IGNORE_DIRECTORIES = {
     ".git",
     "venv",
     ".venv",
     "__pycache__",
-    "node_modules",
-    "build",
-    "dist",
     ".eggs",
     ".pytest_cache",
     ".mypy_cache",
@@ -36,6 +35,46 @@ IGNORE_PATTERNS = {
     ".vscode",
 }
 
+# Well-known build output directories to skip when determining source files
+BUILD_ARTIFACT_DIRECTORIES = {
+    "node_modules",
+    ".next",
+    ".nuxt",
+    ".vite",
+    ".yarn",
+    ".svelte-kit",
+    ".output",
+    ".turbo",
+    ".parcel-cache",
+    ".vercel",
+    ".serverless",
+    "build",
+    "dist",
+    "out",
+    "tmp",
+    "coverage",
+}
+
+# Default ignore patterns combines base directories and build artifacts
+IGNORE_PATTERNS = BASE_IGNORE_DIRECTORIES | BUILD_ARTIFACT_DIRECTORIES
+
+# Directory prefixes that should always be ignored
+IGNORED_DIRECTORY_PREFIXES = (".",)
+
+
+def should_ignore_directory(name: str, ignore_patterns: set[str] | None = None) -> bool:
+    """Return True if the directory name should be ignored."""
+    patterns = IGNORE_PATTERNS if ignore_patterns is None else ignore_patterns
+    if name in patterns:
+        return True
+    return name.startswith(IGNORED_DIRECTORY_PREFIXES)
+
+
+def is_path_ignored(path: Path, ignore_patterns: set[str] | None = None) -> bool:
+    """Return True if any part of the path should be ignored."""
+    patterns = IGNORE_PATTERNS if ignore_patterns is None else ignore_patterns
+    return any(should_ignore_directory(part, patterns) for part in path.parts)
+
 
 class Ingestor:
     """Handles all communication and ingestion with the Kuzu database."""
@@ -582,7 +621,7 @@ class SimpleGraphBuilder:
             # Don't let progress callback errors crash the build
             logger.debug(f"Progress callback error: {e}")
 
-    def run(self) -> None:
+    async def run(self) -> None:
         """Run the three-pass graph building process."""
         logger.info(f"Building graph for project: {self.project_name}")
 
@@ -592,7 +631,7 @@ class SimpleGraphBuilder:
 
         # Pass 2: Definitions
         logger.info("Pass 2: Processing files and extracting definitions...")
-        self._process_files()
+        await self._process_files()
 
         # Pass 3: Relationships
         logger.info("Pass 3: Processing relationships (calls, imports)...")
@@ -607,7 +646,9 @@ class SimpleGraphBuilder:
         """First pass: Walk directory to find packages and folders."""
         dir_count = 0
         for root_str, dirs, _ in os.walk(self.repo_path, topdown=True):
-            dirs[:] = [d for d in dirs if d not in self.ignore_dirs]
+            dirs[:] = [
+                d for d in dirs if not should_ignore_directory(d, self.ignore_dirs)
+            ]
             root = Path(root_str)
             relative_root = root.relative_to(self.repo_path)
 
@@ -732,7 +773,7 @@ class SimpleGraphBuilder:
             phase_complete=True,
         )
 
-    def _process_files(self) -> None:
+    async def _process_files(self) -> None:
         """Second pass: Process files and extract definitions."""
         # First pass: Count total files
         total_files = 0
@@ -740,7 +781,7 @@ class SimpleGraphBuilder:
             root = Path(root_str)
 
             # Skip ignored directories
-            if any(part in self.ignore_dirs for part in root.parts):
+            if is_path_ignored(root, self.ignore_dirs):
                 continue
 
             for filename in files:
@@ -757,7 +798,7 @@ class SimpleGraphBuilder:
             root = Path(root_str)
 
             # Skip ignored directories
-            if any(part in self.ignore_dirs for part in root.parts):
+            if is_path_ignored(root, self.ignore_dirs):
                 continue
 
             for filename in files:
@@ -768,7 +809,7 @@ class SimpleGraphBuilder:
                 lang_config = get_language_config(ext)
 
                 if lang_config and lang_config.name in self.parsers:
-                    self._process_single_file(filepath, lang_config.name)
+                    await self._process_single_file(filepath, lang_config.name)
                     file_count += 1
 
                     # Report progress after each file
@@ -793,7 +834,7 @@ class SimpleGraphBuilder:
             phase_complete=True,
         )
 
-    def _process_single_file(self, filepath: Path, language: str) -> None:
+    async def _process_single_file(self, filepath: Path, language: str) -> None:
         """Process a single file."""
         relative_path = filepath.relative_to(self.repo_path)
         relative_path_str = str(relative_path).replace(os.sep, "/")
@@ -834,8 +875,8 @@ class SimpleGraphBuilder:
 
         # Parse file
         try:
-            with open(filepath, "rb") as f:
-                content = f.read()
+            async with aiofiles.open(filepath, "rb") as f:
+                content = await f.read()
 
             parser = self.parsers[language]
             tree = parser.parse(content)
@@ -1597,7 +1638,7 @@ class CodebaseIngestor:
             )
             if self.project_name:
                 builder.project_name = self.project_name
-            builder.run()
+            asyncio.run(builder.run())
 
             logger.info(f"Graph successfully created at: {self.db_path}")
 

shotgun/codebase/core/manager.py

@@ -51,9 +51,13 @@ class CodebaseFileHandler(FileSystemEventHandler):
         self.pending_changes: list[FileChange] = []
         self._lock = anyio.Lock()
         # Import default ignore patterns from ingestor
-        from shotgun.codebase.core.ingestor import IGNORE_PATTERNS
+        from shotgun.codebase.core.ingestor import (
+            IGNORE_PATTERNS,
+            should_ignore_directory,
+        )
 
         self.ignore_patterns = ignore_patterns or IGNORE_PATTERNS
+        self._should_ignore_directory = should_ignore_directory
 
     def on_any_event(self, event: FileSystemEvent) -> None:
         """Handle any file system event."""
@@ -71,7 +75,7 @@ class CodebaseFileHandler(FileSystemEventHandler):
 
         # Check if any parent directory should be ignored
         for parent in path.parents:
-            if parent.name in self.ignore_patterns:
+            if self._should_ignore_directory(parent.name, self.ignore_patterns):
                 logger.debug(
                     f"Ignoring file in ignored directory: {parent.name} - path: {src_path_str}"
                 )
@@ -106,7 +110,7 @@ class CodebaseFileHandler(FileSystemEventHandler):
             )
             dest_path = Path(dest_path_str)
             for parent in dest_path.parents:
-                if parent.name in self.ignore_patterns:
+                if self._should_ignore_directory(parent.name, self.ignore_patterns):
                     logger.debug(
                         f"Ignoring move to ignored directory: {parent.name} - dest_path: {dest_path_str}"
                     )
@@ -367,7 +371,16 @@ class CodebaseGraphManager:
                 )
                 import shutil
 
-                shutil.rmtree(graph_path)
+                # Handle both files and directories (kuzu v0.11.2+ uses files)
+                if graph_path.is_file():
+                    graph_path.unlink()  # Delete file
+                    # Also delete WAL file if it exists
+                    wal_path = graph_path.with_suffix(graph_path.suffix + ".wal")
+                    if wal_path.exists():
+                        wal_path.unlink()
+                        logger.debug(f"Deleted WAL file: {wal_path}")
+                else:
+                    shutil.rmtree(graph_path)  # Delete directory
 
         # Import the builder from local core module
         from shotgun.codebase.core import CodebaseIngestor
@@ -756,7 +769,7 @@ class CodebaseGraphManager:
 
                     lang_config = get_language_config(full_path.suffix)
                     if lang_config and lang_config.name in parsers:
-                        builder._process_single_file(full_path, lang_config.name)
+                        await builder._process_single_file(full_path, lang_config.name)
                         stats["nodes_modified"] += 1  # Approximate
 
             # Process additions
@@ -771,7 +784,7 @@ class CodebaseGraphManager:
 
                     lang_config = get_language_config(full_path.suffix)
                     if lang_config and lang_config.name in parsers:
-                        builder._process_single_file(full_path, lang_config.name)
+                        await builder._process_single_file(full_path, lang_config.name)
                         stats["nodes_added"] += 1  # Approximate
 
             # Flush all pending operations
@@ -1738,7 +1751,7 @@ class CodebaseGraphManager:
             )
 
             # Build the graph
-            builder.run()
+            asyncio.run(builder.run())
 
         # Run build in thread pool
         await anyio.to_thread.run_sync(_build_graph)

shotgun/codebase/core/nl_query.py

@@ -34,7 +34,7 @@ async def llm_cypher_prompt(
     Returns:
         CypherGenerationResponse with cypher_query, can_generate flag, and reason if not
     """
-    model_config = get_provider_model()
+    model_config = await get_provider_model()
 
     # Create an agent with structured output for Cypher generation
     cypher_agent = Agent(

shotgun/codebase/models.py

@@ -1,13 +1,13 @@
 """Data models for codebase service."""
 
 from collections.abc import Callable
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from pydantic import BaseModel, Field
 
 
-class GraphStatus(str, Enum):
+class GraphStatus(StrEnum):
     """Status of a code knowledge graph."""
 
     READY = "READY"  # Graph is ready for queries
@@ -16,14 +16,14 @@ class GraphStatus(str, Enum):
     ERROR = "ERROR"  # Last operation failed
 
 
-class QueryType(str, Enum):
+class QueryType(StrEnum):
     """Type of query being executed."""
 
     NATURAL_LANGUAGE = "natural_language"
     CYPHER = "cypher"
 
 
-class ProgressPhase(str, Enum):
+class ProgressPhase(StrEnum):
     """Phase of codebase indexing progress."""
 
     STRUCTURE = "structure"  # Identifying packages and folders

shotgun/exceptions.py

@@ -0,0 +1,32 @@
+"""General exceptions for Shotgun application."""
+
+
+class ErrorNotPickedUpBySentry(Exception):  # noqa: N818
+    """Base for user-actionable errors that shouldn't be sent to Sentry.
+
+    These errors represent expected user conditions requiring action
+    rather than bugs that need tracking.
+    """
+
+
+class ContextSizeLimitExceeded(ErrorNotPickedUpBySentry):
+    """Raised when conversation context exceeds the model's limits.
+
+    This is a user-actionable error - they need to either:
+    1. Switch to a larger context model
+    2. Switch to a larger model, compact their conversation, then switch back
+    3. Clear the conversation and start fresh
+    """
+
+    def __init__(self, model_name: str, max_tokens: int):
+        """Initialize the exception.
+
+        Args:
+            model_name: Name of the model whose limit was exceeded
+            max_tokens: Maximum tokens allowed by the model
+        """
+        self.model_name = model_name
+        self.max_tokens = max_tokens
+        super().__init__(
+            f"Context too large for {model_name} (limit: {max_tokens:,} tokens)"
+        )

shotgun/llm_proxy/__init__.py

@@ -0,0 +1,19 @@
+"""LiteLLM proxy client utilities and configuration."""
+
+from .clients import (
+    create_anthropic_proxy_provider,
+    create_litellm_provider,
+)
+from .constants import (
+    LITELLM_PROXY_ANTHROPIC_BASE,
+    LITELLM_PROXY_BASE_URL,
+    LITELLM_PROXY_OPENAI_BASE,
+)
+
+__all__ = [
+    "LITELLM_PROXY_BASE_URL",
+    "LITELLM_PROXY_ANTHROPIC_BASE",
+    "LITELLM_PROXY_OPENAI_BASE",
+    "create_litellm_provider",
+    "create_anthropic_proxy_provider",
+]

shotgun/llm_proxy/clients.py

@@ -0,0 +1,44 @@
+"""Client creation utilities for LiteLLM proxy."""
+
+from pydantic_ai.providers.anthropic import AnthropicProvider
+from pydantic_ai.providers.litellm import LiteLLMProvider
+
+from .constants import LITELLM_PROXY_ANTHROPIC_BASE, LITELLM_PROXY_BASE_URL
+
+
+def create_litellm_provider(api_key: str) -> LiteLLMProvider:
+    """Create LiteLLM provider for Shotgun Account.
+
+    Args:
+        api_key: Shotgun API key
+
+    Returns:
+        Configured LiteLLM provider pointing to Shotgun's proxy
+    """
+    return LiteLLMProvider(
+        api_base=LITELLM_PROXY_BASE_URL,
+        api_key=api_key,
+    )
+
+
+def create_anthropic_proxy_provider(api_key: str) -> AnthropicProvider:
+    """Create Anthropic provider configured for LiteLLM proxy.
+
+    This provider uses native Anthropic API format while routing through
+    the LiteLLM proxy. This preserves Anthropic-specific features like
+    tool_choice and web search.
+
+    The provider's .client attribute provides access to the async Anthropic
+    client (AsyncAnthropic), which should be used for all API operations
+    including token counting.
+
+    Args:
+        api_key: Shotgun API key
+
+    Returns:
+        AnthropicProvider configured to use LiteLLM proxy /anthropic endpoint
+    """
+    return AnthropicProvider(
+        api_key=api_key,
+        base_url=LITELLM_PROXY_ANTHROPIC_BASE,
+    )

shotgun/llm_proxy/constants.py

@@ -0,0 +1,15 @@
+"""LiteLLM proxy constants and configuration."""
+
+# Import from centralized API endpoints module
+from shotgun.api_endpoints import (
+    LITELLM_PROXY_ANTHROPIC_BASE,
+    LITELLM_PROXY_BASE_URL,
+    LITELLM_PROXY_OPENAI_BASE,
+)
+
+# Re-export for backward compatibility
+__all__ = [
+    "LITELLM_PROXY_BASE_URL",
+    "LITELLM_PROXY_ANTHROPIC_BASE",
+    "LITELLM_PROXY_OPENAI_BASE",
+]

shotgun/logging_config.py

@@ -2,12 +2,16 @@
 
 import logging
 import logging.handlers
-import os
 import sys
+from datetime import datetime, timezone
 from pathlib import Path
 
+from shotgun.settings import settings
 from shotgun.utils.env_utils import is_truthy
 
+# Generate a single timestamp for this run to be used across all loggers
+_RUN_TIMESTAMP = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%SZ")
+
 
 def get_log_directory() -> Path:
     """Get the log directory path, creating it if necessary.
@@ -66,21 +70,16 @@ def setup_logger(
     logger = logging.getLogger(name)
 
     # Check if we already have a file handler
-    has_file_handler = any(
-        isinstance(h, logging.handlers.TimedRotatingFileHandler)
-        for h in logger.handlers
-    )
+    has_file_handler = any(isinstance(h, logging.FileHandler) for h in logger.handlers)
 
     # If we already have a file handler, just return the logger
     if has_file_handler:
         return logger
 
-    # Get log level from environment variable, default to INFO
-    env_level = os.getenv("SHOTGUN_LOG_LEVEL", "INFO").upper()
-    if env_level not in ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]:
-        env_level = "INFO"
+    # Get log level from settings (already validated and uppercased)
+    log_level = settings.logging.log_level
 
-    logger.setLevel(getattr(logging, env_level))
+    logger.setLevel(getattr(logging, log_level))
 
     # Default format string
     if format_string is None:
@@ -102,13 +101,13 @@ def setup_logger(
     # Check if console logging is enabled (default: off)
     # Force console logging OFF if Logfire is enabled in dev build
     console_logging_enabled = (
-        is_truthy(os.getenv("LOGGING_TO_CONSOLE", "false")) and not is_logfire_dev_build
+        settings.logging.logging_to_console and not is_logfire_dev_build
     )
 
     if console_logging_enabled:
         # Create console handler
         console_handler = logging.StreamHandler(sys.stdout)
-        console_handler.setLevel(getattr(logging, env_level))
+        console_handler.setLevel(getattr(logging, log_level))
 
         # Use colored formatter for console
         console_formatter = ColoredFormatter(format_string, datefmt="%H:%M:%S")
@@ -118,26 +117,21 @@ def setup_logger(
         logger.addHandler(console_handler)
 
     # Check if file logging is enabled (default: on)
-    file_logging_enabled = is_truthy(os.getenv("LOGGING_TO_FILE", "true"))
+    file_logging_enabled = settings.logging.logging_to_file
 
     if file_logging_enabled:
         try:
-            # Create file handler with rotation
+            # Create file handler with ISO8601 timestamp for each run
             log_dir = get_log_directory()
-            log_file = log_dir / "shotgun.log"
+            log_file = log_dir / f"shotgun-{_RUN_TIMESTAMP}.log"
 
-            # Use TimedRotatingFileHandler - rotates daily and keeps 7 days of logs
-            file_handler = logging.handlers.TimedRotatingFileHandler(
+            # Use regular FileHandler - each run gets its own isolated log file
+            file_handler = logging.FileHandler(
                 filename=log_file,
-                when="midnight",  # Rotate at midnight
-                interval=1,  # Every 1 day
-                backupCount=7,  # Keep 7 days of logs
                 encoding="utf-8",
             )
 
-            # Also set max file size (10MB) using RotatingFileHandler as fallback
-            # Note: We'll use TimedRotatingFileHandler which handles both time and size
-            file_handler.setLevel(getattr(logging, env_level))
+            file_handler.setLevel(getattr(logging, log_level))
 
             # Use standard formatter for file (no colors)
             file_formatter = logging.Formatter(
@@ -191,10 +185,7 @@ def get_logger(name: str) -> logging.Logger:
     logger = logging.getLogger(name)
 
     # Check if we have a file handler already
-    has_file_handler = any(
-        isinstance(h, logging.handlers.TimedRotatingFileHandler)
-        for h in logger.handlers
-    )
+    has_file_handler = any(isinstance(h, logging.FileHandler) for h in logger.handlers)
 
     # If no file handler, set up the logger (will add file handler)
     if not has_file_handler:

shotgun/main.py

@@ -1,5 +1,11 @@
 """Main CLI application for shotgun."""
 
+# NOTE: These are before we import any Google library to stop the noisy gRPC logs.
+import os  # noqa: I001
+
+os.environ["GRPC_VERBOSITY"] = "ERROR"
+os.environ["GLOG_minloglevel"] = "2"
+
 import logging
 
 # CRITICAL: Add NullHandler to root logger before ANY other imports.
@@ -16,7 +22,20 @@ from dotenv import load_dotenv
 
 from shotgun import __version__
 from shotgun.agents.config import get_config_manager
-from shotgun.cli import codebase, config, export, plan, research, specify, tasks, update
+from shotgun.cli import (
+    clear,
+    codebase,
+    compact,
+    config,
+    context,
+    export,
+    feedback,
+    plan,
+    research,
+    specify,
+    tasks,
+    update,
+)
 from shotgun.logging_config import configure_root_logger, get_logger
 from shotgun.posthog_telemetry import setup_posthog_observability
 from shotgun.sentry_telemetry import setup_sentry_observability
@@ -37,8 +56,10 @@ logger.debug("Logfire observability enabled: %s", _logfire_enabled)
 
 # Initialize configuration
 try:
+    import asyncio
+
     config_manager = get_config_manager()
-    config_manager.load()  # Ensure config is loaded at startup
+    asyncio.run(config_manager.load())  # Ensure config is loaded at startup
 except Exception as e:
     logger.debug("Configuration initialization warning: %s", e)
 
@@ -62,12 +83,16 @@ app.add_typer(config.app, name="config", help="Manage Shotgun configuration")
 app.add_typer(
     codebase.app, name="codebase", help="Manage and query code knowledge graphs"
 )
+app.add_typer(context.app, name="context", help="Analyze conversation context usage")
+app.add_typer(compact.app, name="compact", help="Compact conversation history")
+app.add_typer(clear.app, name="clear", help="Clear conversation history")
 app.add_typer(research.app, name="research", help="Perform research with agentic loops")
 app.add_typer(plan.app, name="plan", help="Generate structured plans")
 app.add_typer(specify.app, name="specify", help="Generate comprehensive specifications")
 app.add_typer(tasks.app, name="tasks", help="Generate task lists with agentic approach")
 app.add_typer(export.app, name="export", help="Export artifacts to various formats")
 app.add_typer(update.app, name="update", help="Check for and install updates")
+app.add_typer(feedback.app, name="feedback", help="Send us feedback")
 
 
 def version_callback(value: bool) -> None:
@@ -108,6 +133,41 @@ def main(
             help="Continue previous TUI conversation",
         ),
     ] = False,
+    web: Annotated[
+        bool,
+        typer.Option(
+            "--web",
+            help="Serve TUI as web application",
+        ),
+    ] = False,
+    port: Annotated[
+        int,
+        typer.Option(
+            "--port",
+            help="Port for web server (only used with --web)",
+        ),
+    ] = 8000,
+    host: Annotated[
+        str,
+        typer.Option(
+            "--host",
+            help="Host address for web server (only used with --web)",
+        ),
+    ] = "localhost",
+    public_url: Annotated[
+        str | None,
+        typer.Option(
+            "--public-url",
+            help="Public URL if behind proxy (only used with --web)",
+        ),
+    ] = None,
+    force_reindex: Annotated[
+        bool,
+        typer.Option(
+            "--force-reindex",
+            help="Force re-indexing of codebase (ignores existing index)",
+        ),
+    ] = False,
 ) -> None:
     """Shotgun - AI-powered CLI tool."""
     logger.debug("Starting shotgun CLI application")
@@ -117,16 +177,35 @@ def main(
         perform_auto_update_async(no_update_check=no_update_check)
 
     if ctx.invoked_subcommand is None and not ctx.resilient_parsing:
-        logger.debug("Launching shotgun TUI application")
-        try:
-            tui_app.run(
-                no_update_check=no_update_check, continue_session=continue_session
-            )
-        finally:
-            # Ensure PostHog is shut down cleanly even if TUI exits unexpectedly
-            from shotgun.posthog_telemetry import shutdown
-
-            shutdown()
+        if web:
+            logger.debug("Launching shotgun TUI as web application")
+            try:
+                tui_app.serve(
+                    host=host,
+                    port=port,
+                    public_url=public_url,
+                    no_update_check=no_update_check,
+                    continue_session=continue_session,
+                    force_reindex=force_reindex,
+                )
+            finally:
+                # Ensure PostHog is shut down cleanly even if server exits unexpectedly
+                from shotgun.posthog_telemetry import shutdown
+
+                shutdown()
+        else:
+            logger.debug("Launching shotgun TUI application")
+            try:
+                tui_app.run(
+                    no_update_check=no_update_check,
+                    continue_session=continue_session,
+                    force_reindex=force_reindex,
+                )
+            finally:
+                # Ensure PostHog is shut down cleanly even if TUI exits unexpectedly
+                from shotgun.posthog_telemetry import shutdown
+
+                shutdown()
         raise typer.Exit()
 
     # For CLI commands, register PostHog shutdown handler