shotgun-sh 0.2.1.dev1__py3-none-any.whl → 0.2.1.dev3__py3-none-any.whl

shotgun/agents/agent_manager.py

@@ -115,12 +115,12 @@ class AgentManager(Widget):
         super().__init__()
         self.display = False
 
+        if deps is None:
+            raise ValueError("AgentDeps must be provided to AgentManager")
+
         # Use provided deps or create default with interactive mode
         self.deps = deps
 
-        if self.deps is None:
-            raise ValueError("AgentDeps must be provided to AgentManager")
-
         # Create AgentRuntimeOptions from deps for agent creation
         agent_runtime_options = AgentRuntimeOptions(
             interactive_mode=self.deps.interactive_mode,
@@ -269,6 +269,7 @@ class AgentManager(Widget):
         Returns:
             The agent run result.
         """
+        logger.info(f"Running agent {self._current_agent_type.value}")
         # Use merged deps (shared state + agent-specific system prompt) if not provided
         if deps is None:
             deps = self._create_merged_deps(self._current_agent_type)
@@ -395,6 +396,10 @@ class AgentManager(Widget):
         # Apply compaction to persistent message history to prevent cascading growth
         all_messages = result.all_messages()
         self.message_history = await apply_persistent_compaction(all_messages, deps)
+        usage = result.usage()
+        deps.usage_manager.add_usage(
+            usage, model_name=deps.llm_model.name, provider=deps.llm_model.provider
+        )
 
         # Log file operations summary if any files were modified
         file_operations = deps.file_tracker.operations.copy()
@@ -641,6 +646,9 @@ class AgentManager(Widget):
                 filtered_messages.append(msg)
         return filtered_messages
 
+    def get_usage_hint(self) -> str | None:
+        return self.deps.usage_manager.build_usage_hint()
+
     def get_conversation_state(self) -> "ConversationState":
         """Get the current conversation state.
 

shotgun/agents/config/manager.py

@@ -1,7 +1,6 @@
 """Configuration manager for Shotgun CLI."""
 
 import json
-import os
 import uuid
 from pathlib import Path
 from typing import Any
@@ -12,10 +11,7 @@ from shotgun.logging_config import get_logger
 from shotgun.utils import get_shotgun_home
 
 from .constants import (
-    ANTHROPIC_API_KEY_ENV,
     API_KEY_FIELD,
-    GEMINI_API_KEY_ENV,
-    OPENAI_API_KEY_ENV,
     ConfigSection,
 )
 from .models import (
@@ -113,7 +109,7 @@ class ConfigManager:
                             # Find default model for this provider
                             provider_models = {
                                 ProviderType.OPENAI: ModelName.GPT_5,
-                                ProviderType.ANTHROPIC: ModelName.CLAUDE_OPUS_4_1,
+                                ProviderType.ANTHROPIC: ModelName.CLAUDE_SONNET_4_5,
                                 ProviderType.GOOGLE: ModelName.GEMINI_2_5_PRO,
                             }
 
@@ -214,7 +210,7 @@ class ConfigManager:
 
                 provider_models = {
                     ProviderType.OPENAI: ModelName.GPT_5,
-                    ProviderType.ANTHROPIC: ModelName.CLAUDE_OPUS_4_1,
+                    ProviderType.ANTHROPIC: ModelName.CLAUDE_SONNET_4_5,
                     ProviderType.GOOGLE: ModelName.GEMINI_2_5_PRO,
                 }
                 if provider_enum in provider_models:
@@ -245,25 +241,13 @@ class ConfigManager:
     def has_provider_key(self, provider: ProviderType | str) -> bool:
         """Check if the given provider has a non-empty API key configured.
 
-        This checks both the configuration file and environment variables.
+        This checks only the configuration file.
         """
         config = self.load()
         provider_enum = self._ensure_provider_enum(provider)
         provider_config = self._get_provider_config(config, provider_enum)
 
-        # Check config first
-        if self._provider_has_api_key(provider_config):
-            return True
-
-        # Check environment variable
-        if provider_enum == ProviderType.OPENAI:
-            return bool(os.getenv(OPENAI_API_KEY_ENV))
-        elif provider_enum == ProviderType.ANTHROPIC:
-            return bool(os.getenv(ANTHROPIC_API_KEY_ENV))
-        elif provider_enum == ProviderType.GOOGLE:
-            return bool(os.getenv(GEMINI_API_KEY_ENV))
-
-        return False
+        return self._provider_has_api_key(provider_config)
 
     def has_any_provider_key(self) -> bool:
         """Determine whether any provider has a configured API key."""

shotgun/agents/config/models.py

@@ -27,6 +27,7 @@ class ModelName(StrEnum):
     GPT_5 = "gpt-5"
     GPT_5_MINI = "gpt-5-mini"
     CLAUDE_OPUS_4_1 = "claude-opus-4-1"
+    CLAUDE_SONNET_4_5 = "claude-sonnet-4-5"
     GEMINI_2_5_PRO = "gemini-2.5-pro"
     GEMINI_2_5_FLASH = "gemini-2.5-flash"
 
@@ -102,6 +103,13 @@ MODEL_SPECS: dict[ModelName, ModelSpec] = {
         max_output_tokens=32_000,
         litellm_proxy_model_name="anthropic/claude-opus-4-1",
     ),
+    ModelName.CLAUDE_SONNET_4_5: ModelSpec(
+        name=ModelName.CLAUDE_SONNET_4_5,
+        provider=ProviderType.ANTHROPIC,
+        max_input_tokens=200_000,
+        max_output_tokens=16_000,
+        litellm_proxy_model_name="anthropic/claude-sonnet-4-5",
+    ),
     ModelName.GEMINI_2_5_PRO: ModelSpec(
         name=ModelName.GEMINI_2_5_PRO,
         provider=ProviderType.GOOGLE,

shotgun/agents/config/provider.py

@@ -1,7 +1,5 @@
 """Provider management for LLM configuration."""
 
-import os
-
 from pydantic import SecretStr
 from pydantic_ai.models import Model
 from pydantic_ai.models.anthropic import AnthropicModel, AnthropicModelSettings
@@ -15,12 +13,6 @@ from pydantic_ai.settings import ModelSettings
 from shotgun.llm_proxy import create_litellm_provider
 from shotgun.logging_config import get_logger
 
-from .constants import (
-    ANTHROPIC_API_KEY_ENV,
-    GEMINI_API_KEY_ENV,
-    OPENAI_API_KEY_ENV,
-    SHOTGUN_API_KEY_ENV,
-)
 from .manager import get_config_manager
 from .models import (
     MODEL_SPECS,
@@ -150,10 +142,10 @@ def get_provider_model(
     config = config_manager.load()
 
     # Priority 1: Check if Shotgun key exists - if so, use it for ANY model
-    shotgun_api_key = _get_api_key(config.shotgun.api_key, SHOTGUN_API_KEY_ENV)
+    shotgun_api_key = _get_api_key(config.shotgun.api_key)
     if shotgun_api_key:
-        # Use selected model or default to claude-opus-4-1
-        model_name = config.selected_model or ModelName.CLAUDE_OPUS_4_1
+        # Use selected model or default to claude-sonnet-4-5
+        model_name = config.selected_model or ModelName.CLAUDE_SONNET_4_5
         if model_name not in MODEL_SPECS:
             raise ValueError(f"Model '{model_name.value}' not found")
         spec = MODEL_SPECS[model_name]
@@ -202,11 +194,9 @@ def get_provider_model(
         requested_model = None  # Will use provider's default model
 
     if provider_enum == ProviderType.OPENAI:
-        api_key = _get_api_key(config.openai.api_key, OPENAI_API_KEY_ENV)
+        api_key = _get_api_key(config.openai.api_key)
         if not api_key:
-            raise ValueError(
-                f"OpenAI API key not configured. Set via environment variable {OPENAI_API_KEY_ENV} or config."
-            )
+            raise ValueError("OpenAI API key not configured. Set via config.")
 
         # Use requested model or default to gpt-5
         model_name = requested_model if requested_model else ModelName.GPT_5
@@ -225,14 +215,12 @@ def get_provider_model(
         )
 
     elif provider_enum == ProviderType.ANTHROPIC:
-        api_key = _get_api_key(config.anthropic.api_key, ANTHROPIC_API_KEY_ENV)
+        api_key = _get_api_key(config.anthropic.api_key)
         if not api_key:
-            raise ValueError(
-                f"Anthropic API key not configured. Set via environment variable {ANTHROPIC_API_KEY_ENV} or config."
-            )
+            raise ValueError("Anthropic API key not configured. Set via config.")
 
-        # Use requested model or default to claude-opus-4-1
-        model_name = requested_model if requested_model else ModelName.CLAUDE_OPUS_4_1
+        # Use requested model or default to claude-sonnet-4-5
+        model_name = requested_model if requested_model else ModelName.CLAUDE_SONNET_4_5
         if model_name not in MODEL_SPECS:
             raise ValueError(f"Model '{model_name.value}' not found")
         spec = MODEL_SPECS[model_name]
@@ -248,11 +236,9 @@ def get_provider_model(
         )
 
     elif provider_enum == ProviderType.GOOGLE:
-        api_key = _get_api_key(config.google.api_key, GEMINI_API_KEY_ENV)
+        api_key = _get_api_key(config.google.api_key)
         if not api_key:
-            raise ValueError(
-                f"Gemini API key not configured. Set via environment variable {GEMINI_API_KEY_ENV} or config."
-            )
+            raise ValueError("Gemini API key not configured. Set via config.")
 
         # Use requested model or default to gemini-2.5-pro
         model_name = requested_model if requested_model else ModelName.GEMINI_2_5_PRO
@@ -285,20 +271,19 @@ def _has_provider_key(config: "ShotgunConfig", provider: ProviderType) -> bool:
         True if provider has a configured API key
     """
     if provider == ProviderType.OPENAI:
-        return bool(_get_api_key(config.openai.api_key, OPENAI_API_KEY_ENV))
+        return bool(_get_api_key(config.openai.api_key))
     elif provider == ProviderType.ANTHROPIC:
-        return bool(_get_api_key(config.anthropic.api_key, ANTHROPIC_API_KEY_ENV))
+        return bool(_get_api_key(config.anthropic.api_key))
     elif provider == ProviderType.GOOGLE:
-        return bool(_get_api_key(config.google.api_key, GEMINI_API_KEY_ENV))
+        return bool(_get_api_key(config.google.api_key))
     return False
 
 
-def _get_api_key(config_key: SecretStr | None, env_var: str) -> str | None:
-    """Get API key from config or environment variable.
+def _get_api_key(config_key: SecretStr | None) -> str | None:
+    """Get API key from config.
 
     Args:
         config_key: API key from configuration
-        env_var: Environment variable name to check
 
     Returns:
         API key string or None
@@ -306,4 +291,4 @@ def _get_api_key(config_key: SecretStr | None, env_var: str) -> str | None:
     if config_key is not None:
         return config_key.get_secret_value()
 
-    return os.getenv(env_var)
+    return None

shotgun/agents/models.py

@@ -11,6 +11,8 @@ from typing import TYPE_CHECKING
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic_ai import RunContext
 
+from shotgun.agents.usage_manager import SessionUsageManager, get_session_usage_manager
+
 from .config.models import ModelConfig
 
 if TYPE_CHECKING:
@@ -108,6 +110,11 @@ class AgentRuntimeOptions(BaseModel):
         description="Tasks for storing deferred tool results",
     )
 
+    usage_manager: SessionUsageManager = Field(
+        default_factory=get_session_usage_manager,
+        description="Usage manager for tracking usage",
+    )
+
 
 class FileOperationType(StrEnum):
     """Types of file operations that can be tracked."""

shotgun/agents/tools/web_search/anthropic.py

@@ -94,7 +94,6 @@ async def anthropic_web_search_tool(query: str) -> str:
 
 async def main() -> None:
     """Main function for testing the Anthropic web search tool."""
-    import os
     import sys
 
     from shotgun.logging_config import setup_logger
@@ -119,15 +118,14 @@ async def main() -> None:
     print("=" * 60)
 
     # Check if API key is available
-    if not (
-        os.getenv("ANTHROPIC_API_KEY")
-        or (
-            callable(get_provider_model)
-            and get_provider_model(ProviderType.ANTHROPIC).api_key
-        )
-    ):
-        print("❌ Error: ANTHROPIC_API_KEY environment variable not set")
-        print("   Please set it with: export ANTHROPIC_API_KEY=your_key_here")
+    try:
+        if callable(get_provider_model):
+            model_config = get_provider_model(ProviderType.ANTHROPIC)
+            if not model_config.api_key:
+                raise ValueError("No API key configured")
+    except (ValueError, Exception):
+        print("❌ Error: Anthropic API key not configured")
+        print("   Please set it in your config file")
         sys.exit(1)
 
     try:

shotgun/agents/usage_manager.py

@@ -0,0 +1,159 @@
+import json
+from collections import defaultdict
+from dataclasses import dataclass
+from datetime import datetime
+from logging import getLogger
+from pathlib import Path
+from typing import TypeAlias
+
+from genai_prices import calc_price
+from pydantic import BaseModel, Field
+from pydantic_ai import RunUsage
+
+from shotgun.agents.config.models import ProviderType
+from shotgun.utils import get_shotgun_home
+
+logger = getLogger(__name__)
+ModelName: TypeAlias = str
+
+
+@dataclass(frozen=True)
+class UsageSummaryEntry:
+    model_name: ModelName
+    provider: ProviderType
+    usage: RunUsage
+
+
+class UsageLogEntry(BaseModel):
+    timestamp: datetime = Field(default_factory=datetime.now)
+    model_name: ModelName
+    usage: RunUsage
+    provider: ProviderType
+
+
+class SessionUsage(BaseModel):
+    usage: RunUsage
+    log: list[UsageLogEntry]
+
+
+class UsageState(BaseModel):
+    usage: dict[ModelName, RunUsage] = Field(default_factory=dict)
+    model_providers: dict[ModelName, ProviderType] = Field(default_factory=dict)
+    usage_log: list[UsageLogEntry] = Field(default_factory=list)
+
+
+class SessionUsageManager:
+    def __init__(self) -> None:
+        self.usage: defaultdict[ModelName, RunUsage] = defaultdict(RunUsage)
+        self._model_providers: dict[ModelName, ProviderType] = {}
+        self._usage_log: list[UsageLogEntry] = []
+        self._usage_path: Path = get_shotgun_home() / "usage.json"
+        self.restore_usage_state()
+
+    def add_usage(
+        self, usage: RunUsage, *, model_name: ModelName, provider: ProviderType
+    ) -> None:
+        self.usage[model_name] += usage
+        self._model_providers[model_name] = provider
+        self._usage_log.append(
+            UsageLogEntry(model_name=model_name, usage=usage, provider=provider)
+        )
+        self.persist_usage_state()
+
+    def get_usage_report(self) -> dict[ModelName, RunUsage]:
+        return self.usage.copy()
+
+    def get_usage_breakdown(self) -> list[UsageSummaryEntry]:
+        breakdown: list[UsageSummaryEntry] = []
+        for model_name, usage in self.usage.items():
+            provider = self._model_providers.get(model_name)
+            if provider is None:
+                continue
+            breakdown.append(
+                UsageSummaryEntry(model_name=model_name, provider=provider, usage=usage)
+            )
+        breakdown.sort(key=lambda entry: entry.model_name.lower())
+        return breakdown
+
+    def build_usage_hint(self) -> str | None:
+        return format_usage_hint(self.get_usage_breakdown())
+
+    def persist_usage_state(self) -> None:
+        state = UsageState(
+            usage=dict(self.usage.items()),
+            model_providers=self._model_providers.copy(),
+            usage_log=self._usage_log.copy(),
+        )
+
+        try:
+            self._usage_path.parent.mkdir(parents=True, exist_ok=True)
+            with self._usage_path.open("w", encoding="utf-8") as f:
+                json.dump(state.model_dump(mode="json"), f, indent=2)
+            logger.debug("Usage state persisted to %s", self._usage_path)
+        except Exception as exc:
+            logger.error(
+                "Failed to persist usage state to %s: %s", self._usage_path, exc
+            )
+
+    def restore_usage_state(self) -> None:
+        if not self._usage_path.exists():
+            logger.debug("No usage state file found at %s", self._usage_path)
+            return
+
+        try:
+            with self._usage_path.open(encoding="utf-8") as f:
+                data = json.load(f)
+
+            state = UsageState.model_validate(data)
+        except Exception as exc:
+            logger.error(
+                "Failed to restore usage state from %s: %s", self._usage_path, exc
+            )
+            return
+
+        self.usage = defaultdict(RunUsage)
+        for model_name, usage in state.usage.items():
+            self.usage[model_name] = usage
+
+        self._model_providers = state.model_providers.copy()
+        self._usage_log = state.usage_log.copy()
+
+
+def format_usage_hint(breakdown: list[UsageSummaryEntry]) -> str | None:
+    if not breakdown:
+        return None
+
+    lines = ["# Token usage by model"]
+
+    for entry in breakdown:
+        usage = entry.usage
+        input_tokens = usage.input_tokens
+        output_tokens = usage.output_tokens
+        cached_tokens = usage.cache_read_tokens
+
+        cost = calc_price(usage=usage, model_ref=entry.model_name)
+        input_line = f"* Input: {input_tokens:,}"
+        if cached_tokens > 0:
+            input_line += f" (+ {cached_tokens:,} cached)"
+        input_line += " tokens"
+        section = f"""
+### {entry.model_name}
+
+{input_line}
+* Output: {output_tokens:,} tokens
+* Total: {input_tokens + output_tokens:,} tokens
+* Cost: ${cost.total_price:,.2f}
+""".strip()
+        lines.append(section)
+
+    return "\n\n".join(lines)
+
+
+_usage_manager = None
+
+
+def get_session_usage_manager() -> SessionUsageManager:
+    global _usage_manager
+    if _usage_manager is None:
+        _usage_manager = SessionUsageManager()
+    return _usage_manager

shotgun/cli/config.py

@@ -9,6 +9,7 @@ from rich.table import Table
 
 from shotgun.agents.config import ProviderType, get_config_manager
 from shotgun.logging_config import get_logger
+from shotgun.utils.env_utils import is_shotgun_account_enabled
 
 logger = get_logger(__name__)
 console = Console()
@@ -162,12 +163,17 @@ def _show_full_config(config: Any) -> None:
     table.add_row("", "")  # Separator
 
     # Provider configurations
-    for provider_name, provider_config in [
+    providers_to_show = [
         ("OpenAI", config.openai),
         ("Anthropic", config.anthropic),
         ("Google", config.google),
-        ("Shotgun Account", config.shotgun),
-    ]:
+    ]
+
+    # Only show Shotgun Account if feature flag is enabled
+    if is_shotgun_account_enabled():
+        providers_to_show.append(("Shotgun Account", config.shotgun))
+
+    for provider_name, provider_config in providers_to_show:
         table.add_row(f"[bold]{provider_name}[/bold]", "")
 
         # API Key
@@ -207,7 +213,13 @@ def _show_provider_config(provider: ProviderType, config: Any) -> None:
 
 def _mask_secrets(data: dict[str, Any]) -> None:
     """Mask secrets in configuration data."""
-    for provider in ["openai", "anthropic", "google", "shotgun"]:
+    providers = ["openai", "anthropic", "google"]
+
+    # Only mask shotgun if feature flag is enabled
+    if is_shotgun_account_enabled():
+        providers.append("shotgun")
+
+    for provider in providers:
         if provider in data and isinstance(data[provider], dict):
             if "api_key" in data[provider] and data[provider]["api_key"]:
                 data[provider]["api_key"] = _mask_value(data[provider]["api_key"])

shotgun/cli/feedback.py

@@ -43,4 +43,4 @@ def send_feedback(
 
     submit_feedback_survey(feedback)
 
-    console.print("✅ Feedback sent. Thank you!")
+    console.print("Feedback sent. Thank you!")

shotgun/tui/app.py

@@ -108,7 +108,7 @@ class ShotgunApp(App[None]):
         def handle_feedback(feedback: Feedback | None) -> None:
             if feedback is not None:
                 submit_feedback_survey(feedback)
-                self.notify("✅ Feedback sent. Thank you!")
+                self.notify("Feedback sent. Thank you!")
 
         self.push_screen("feedback", callback=handle_feedback)
 

shotgun/tui/screens/chat.py

@@ -54,10 +54,8 @@ from ..components.prompt_input import PromptInput
 from ..components.spinner import Spinner
 from ..utils.mode_progress import PlaceholderHints
 from .chat_screen.command_providers import (
-    AgentModeProvider,
-    CodebaseCommandProvider,
     DeleteCodebasePaletteProvider,
-    ProviderSetupProvider,
+    UnifiedCommandProvider,
 )
 
 logger = logging.getLogger(__name__)
@@ -228,9 +226,12 @@ class ChatScreen(Screen[None]):
     BINDINGS = [
         ("ctrl+p", "command_palette", "Command Palette"),
         ("shift+tab", "toggle_mode", "Toggle mode"),
+        ("ctrl+u", "show_usage", "Show usage"),
     ]
 
-    COMMANDS = {AgentModeProvider, ProviderSetupProvider, CodebaseCommandProvider}
+    COMMANDS = {
+        UnifiedCommandProvider,
+    }
 
     value = reactive("")
     mode = reactive(AgentType.RESEARCH)
@@ -401,6 +402,14 @@ class ChatScreen(Screen[None]):
         # whoops it actually changes focus. Let's be brutal for now
         self.call_later(lambda: self.query_one(PromptInput).focus())
 
+    def action_show_usage(self) -> None:
+        usage_hint = self.agent_manager.get_usage_hint()
+        logger.info(f"Usage hint: {usage_hint}")
+        if usage_hint:
+            self.mount_hint(usage_hint)
+        else:
+            self.notify("No usage hint available", severity="error")
+
     @work
     async def add_question_listener(self) -> None:
         while True:
@@ -589,7 +598,7 @@ class ChatScreen(Screen[None]):
     async def index_codebase(self, selection: CodebaseIndexSelection) -> None:
         label = self.query_one("#indexing-job-display", Static)
         label.update(
-            f"[$foreground-muted]Indexing [bold $text-accent]{selection.name}[/]...[/]"
+            f"[$foreground-muted]Indexing codebase: [bold $text-accent]{selection.name}[/][/]"
         )
         label.refresh()
 
@@ -599,33 +608,33 @@ class ChatScreen(Screen[None]):
             empty = width - filled
             return "▓" * filled + "░" * empty
 
-        # Spinner animation state (shared between timer and progress callback)
+        # Spinner animation frames
         spinner_frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
-        spinner_state: dict[str, int | str | float] = {
+
+        # Progress state (shared between timer and progress callback)
+        progress_state: dict[str, int | float] = {
             "frame_index": 0,
-            "phase_name": "Starting...",
             "percentage": 0.0,
         }
 
-        def update_spinner_display() -> None:
-            """Update spinner frame on timer - runs every 100ms."""
+        def update_progress_display() -> None:
+            """Update progress bar on timer - runs every 100ms."""
             # Advance spinner frame
-            frame_idx = int(spinner_state["frame_index"])
-            spinner_state["frame_index"] = (frame_idx + 1) % len(spinner_frames)
+            frame_idx = int(progress_state["frame_index"])
+            progress_state["frame_index"] = (frame_idx + 1) % len(spinner_frames)
             spinner = spinner_frames[frame_idx]
 
             # Get current state
-            phase = str(spinner_state["phase_name"])
-            pct = float(spinner_state["percentage"])
+            pct = float(progress_state["percentage"])
             bar = create_progress_bar(pct)
 
             # Update label
             label.update(
-                f"[$foreground-muted]Indexing codebase: {spinner} {phase}... {bar} {pct:.0f}%[/]"
+                f"[$foreground-muted]Indexing codebase: {spinner} {bar} {pct:.0f}%[/]"
             )
 
         def progress_callback(progress_info: IndexProgress) -> None:
-            """Update progress state (spinner animates independently on timer)."""
+            """Update progress state (timer renders it independently)."""
             # Calculate overall percentage (0-95%, reserve 95-100% for finalization)
             if progress_info.phase == ProgressPhase.STRUCTURE:
                 # Phase 1: 0-10%, always show 5% while running, 10% when complete
@@ -648,11 +657,10 @@ class ChatScreen(Screen[None]):
                 overall_pct = 0.0
 
             # Update shared state (timer will render it)
-            spinner_state["phase_name"] = progress_info.phase_name
-            spinner_state["percentage"] = overall_pct
+            progress_state["percentage"] = overall_pct
 
-        # Start spinner animation timer (10 fps = 100ms interval)
-        spinner_timer = self.set_interval(0.1, update_spinner_display)
+        # Start progress animation timer (10 fps = 100ms interval)
+        progress_timer = self.set_interval(0.1, update_progress_display)
 
         try:
             # Pass the current working directory as the indexed_from_cwd
@@ -667,14 +675,12 @@ class ChatScreen(Screen[None]):
                 progress_callback=progress_callback,
             )
 
-            # Stop spinner animation
-            spinner_timer.stop()
+            # Stop progress animation
+            progress_timer.stop()
 
             # Show 100% completion after indexing finishes
             final_bar = create_progress_bar(100.0)
-            label.update(
-                f"[$foreground-muted]Indexing codebase: ✓ Complete {final_bar} 100%[/]"
-            )
+            label.update(f"[$foreground-muted]Indexing codebase: {final_bar} 100%[/]")
             label.refresh()
 
             logger.info(
@@ -687,12 +693,12 @@ class ChatScreen(Screen[None]):
             )
 
         except CodebaseAlreadyIndexedError as exc:
-            spinner_timer.stop()
+            progress_timer.stop()
             logger.warning(f"Codebase already indexed: {exc}")
             self.notify(str(exc), severity="warning")
             return
         except InvalidPathError as exc:
-            spinner_timer.stop()
+            progress_timer.stop()
             logger.error(f"Invalid path error: {exc}")
             self.notify(str(exc), severity="error")
 
@@ -704,8 +710,8 @@ class ChatScreen(Screen[None]):
             )
             self.notify(f"Failed to index codebase: {exc}", severity="error")
         finally:
-            # Always stop the spinner timer
-            spinner_timer.stop()
+            # Always stop the progress timer
+            progress_timer.stop()
             label.update("")
             label.refresh()
 
@@ -774,6 +780,7 @@ class ChatScreen(Screen[None]):
 
         # Update the current mode
         self.mode = AgentType(conversation.last_agent_model)
+        self.deps.usage_manager.restore_usage_state()
 
 
 def help_text_with_codebase(already_indexed: bool = False) -> str:

shotgun/tui/screens/chat_screen/command_providers.py

@@ -96,6 +96,38 @@ class AgentModeProvider(Provider):
                 yield Hit(score, matcher.highlight(title), callback, help=help_text)
 
 
+class UsageProvider(Provider):
+    """Command provider for agent mode switching."""
+
+    @property
+    def chat_screen(self) -> "ChatScreen":
+        from shotgun.tui.screens.chat import ChatScreen
+
+        return cast(ChatScreen, self.screen)
+
+    async def discover(self) -> AsyncGenerator[DiscoveryHit, None]:
+        """Provide default mode switching commands when palette opens."""
+        yield DiscoveryHit(
+            "Show usage",
+            self.chat_screen.action_show_usage,
+            help="Display usage information for the current session",
+        )
+
+    async def search(self, query: str) -> AsyncGenerator[Hit, None]:
+        """Search for mode commands."""
+        matcher = self.matcher(query)
+
+        async for discovery_hit in self.discover():
+            score = matcher.match(discovery_hit.text or "")
+            if score > 0:
+                yield Hit(
+                    score,
+                    matcher.highlight(discovery_hit.text or ""),
+                    discovery_hit.command,
+                    help=discovery_hit.help,
+                )
+
+
 class ProviderSetupProvider(Provider):
     """Command palette entries for provider configuration."""
 
@@ -159,30 +191,30 @@ class CodebaseCommandProvider(Provider):
         return cast(ChatScreen, self.screen)
 
     async def discover(self) -> AsyncGenerator[DiscoveryHit, None]:
-        yield DiscoveryHit(
-            "Codebase: Index Codebase",
-            self.chat_screen.index_codebase_command,
-            help="Index a repository into the codebase graph",
-        )
         yield DiscoveryHit(
             "Codebase: Delete Codebase Index",
             self.chat_screen.delete_codebase_command,
             help="Delete an existing codebase index",
         )
+        yield DiscoveryHit(
+            "Codebase: Index Codebase",
+            self.chat_screen.index_codebase_command,
+            help="Index a repository into the codebase graph",
+        )
 
     async def search(self, query: str) -> AsyncGenerator[Hit, None]:
         matcher = self.matcher(query)
         commands = [
-            (
-                "Codebase: Index Codebase",
-                self.chat_screen.index_codebase_command,
-                "Index a repository into the codebase graph",
-            ),
             (
                 "Codebase: Delete Codebase Index",
                 self.chat_screen.delete_codebase_command,
                 "Delete an existing codebase index",
             ),
+            (
+                "Codebase: Index Codebase",
+                self.chat_screen.index_codebase_command,
+                "Index a repository into the codebase graph",
+            ),
         ]
         for title, callback, help_text in commands:
             score = matcher.match(title)
@@ -237,3 +269,88 @@ class DeleteCodebasePaletteProvider(Provider):
                     ),
                     help=graph.repo_path,
                 )
+
+
+class UnifiedCommandProvider(Provider):
+    """Unified command provider with all commands in alphabetical order."""
+
+    @property
+    def chat_screen(self) -> "ChatScreen":
+        from shotgun.tui.screens.chat import ChatScreen
+
+        return cast(ChatScreen, self.screen)
+
+    def open_provider_config(self) -> None:
+        """Show the provider configuration screen."""
+        self.chat_screen.app.push_screen("provider_config")
+
+    def open_model_picker(self) -> None:
+        """Show the model picker screen."""
+        self.chat_screen.app.push_screen("model_picker")
+
+    async def discover(self) -> AsyncGenerator[DiscoveryHit, None]:
+        """Provide commands in alphabetical order when palette opens."""
+        # Alphabetically ordered commands
+        yield DiscoveryHit(
+            "Codebase: Delete Codebase Index",
+            self.chat_screen.delete_codebase_command,
+            help="Delete an existing codebase index",
+        )
+        yield DiscoveryHit(
+            "Codebase: Index Codebase",
+            self.chat_screen.index_codebase_command,
+            help="Index a repository into the codebase graph",
+        )
+        yield DiscoveryHit(
+            "Open Provider Setup",
+            self.open_provider_config,
+            help="⚙️ Manage API keys for available providers",
+        )
+        yield DiscoveryHit(
+            "Select AI Model",
+            self.open_model_picker,
+            help="🤖 Choose which AI model to use",
+        )
+        yield DiscoveryHit(
+            "Show usage",
+            self.chat_screen.action_show_usage,
+            help="Display usage information for the current session",
+        )
+
+    async def search(self, query: str) -> AsyncGenerator[Hit, None]:
+        """Search for commands in alphabetical order."""
+        matcher = self.matcher(query)
+
+        # Define all commands in alphabetical order
+        commands = [
+            (
+                "Codebase: Delete Codebase Index",
+                self.chat_screen.delete_codebase_command,
+                "Delete an existing codebase index",
+            ),
+            (
+                "Codebase: Index Codebase",
+                self.chat_screen.index_codebase_command,
+                "Index a repository into the codebase graph",
+            ),
+            (
+                "Open Provider Setup",
+                self.open_provider_config,
+                "⚙️ Manage API keys for available providers",
+            ),
+            (
+                "Select AI Model",
+                self.open_model_picker,
+                "🤖 Choose which AI model to use",
+            ),
+            (
+                "Show usage",
+                self.chat_screen.action_show_usage,
+                "Display usage information for the current session",
+            ),
+        ]
+
+        for title, callback, help_text in commands:
+            score = matcher.match(title)
+            if score > 0:
+                yield Hit(score, matcher.highlight(title), callback, help=help_text)

shotgun/tui/screens/chat_screen/history.py

@@ -217,7 +217,9 @@ class AgentResponseWidget(Widget):
             return ""
         for idx, part in enumerate(self.item.parts):
             if isinstance(part, TextPart):
-                acc += f"**⏺** {part.content}\n\n"
+                # Only show the circle prefix if there's actual content
+                if part.content and part.content.strip():
+                    acc += f"**⏺** {part.content}\n\n"
             elif isinstance(part, ToolCallPart):
                 parts_str = self._format_tool_call_part(part)
                 acc += parts_str + "\n\n"

shotgun/tui/screens/model_picker.py

@@ -35,10 +35,6 @@ class ModelPickerScreen(Screen[None]):
             layout: vertical;
         }
 
-        ModelPicker > * {
-            height: auto;
-        }
-
         #titlebox {
             height: auto;
             margin: 2 0;
@@ -60,6 +56,7 @@ class ModelPickerScreen(Screen[None]):
         #model-list {
             margin: 2 0;
             height: auto;
+            padding: 1;
             & > * {
             padding: 1 0;
             }
@@ -70,9 +67,6 @@ class ModelPickerScreen(Screen[None]):
         #model-actions > * {
         margin-right: 2;
         }
-        #model-list {
-            padding: 1;
-        }
     """
 
     BINDINGS = [
@@ -97,16 +91,21 @@ class ModelPickerScreen(Screen[None]):
         # Load current selection
         config_manager = self.config_manager
         config = config_manager.load()
-        current_model = config.selected_model or ModelName.CLAUDE_OPUS_4_1
+        current_model = config.selected_model or ModelName.CLAUDE_SONNET_4_5
         self.selected_model = current_model
 
-        # Find and highlight current selection
+        # Find and highlight current selection (if it's in the filtered list)
         list_view = self.query_one(ListView)
         if list_view.children:
-            for i, model_name in enumerate(AVAILABLE_MODELS):
-                if model_name == current_model:
-                    list_view.index = i
-                    break
+            for i, child in enumerate(list_view.children):
+                if isinstance(child, ListItem) and child.id:
+                    model_id = child.id.removeprefix("model-")
+                    # Find the model name
+                    for model_name in AVAILABLE_MODELS:
+                        if _sanitize_model_name_for_id(model_name) == model_id:
+                            if model_name == current_model:
+                                list_view.index = i
+                                break
         self.refresh_model_labels()
 
     def action_done(self) -> None:
@@ -141,9 +140,12 @@ class ModelPickerScreen(Screen[None]):
     def refresh_model_labels(self) -> None:
         """Update the list view entries to reflect current selection."""
         current_model = (
-            self.config_manager.load().selected_model or ModelName.CLAUDE_OPUS_4_1
+            self.config_manager.load().selected_model or ModelName.CLAUDE_SONNET_4_5
         )
+        # Update labels for available models only
         for model_name in AVAILABLE_MODELS:
+            if not self._is_model_available(model_name):
+                continue
             label = self.query_one(
                 f"#label-{_sanitize_model_name_for_id(model_name)}", Label
             )
@@ -155,6 +157,10 @@ class ModelPickerScreen(Screen[None]):
         items: list[ListItem] = []
         current_model = self.selected_model
         for model_name in AVAILABLE_MODELS:
+            # Only add models that are available
+            if not self._is_model_available(model_name):
+                continue
+
             label = Label(
                 self._model_label(model_name, is_current=model_name == current_model),
                 id=f"label-{_sanitize_model_name_for_id(model_name)}",
@@ -165,6 +171,7 @@ class ModelPickerScreen(Screen[None]):
         return items
 
     def _model_from_item(self, item: ListItem | None) -> ModelName | None:
+        """Get ModelName from a ListItem."""
         if item is None or item.id is None:
             return None
         sanitized_id = item.id.removeprefix("model-")
@@ -174,6 +181,32 @@ class ModelPickerScreen(Screen[None]):
                 return model_name
         return None
 
+    def _is_model_available(self, model_name: ModelName) -> bool:
+        """Check if a model is available based on provider key configuration.
+
+        A model is available if:
+        1. Shotgun Account key is configured (provides access to all models), OR
+        2. The model's provider has an API key configured (BYOK mode)
+
+        Args:
+            model_name: The model to check availability for
+
+        Returns:
+            True if the model can be used, False otherwise
+        """
+        config = self.config_manager.load()
+
+        # If Shotgun Account is configured, all models are available
+        if self.config_manager._provider_has_api_key(config.shotgun):
+            return True
+
+        # In BYOK mode, check if the model's provider has a key
+        if model_name not in MODEL_SPECS:
+            return False
+
+        spec = MODEL_SPECS[model_name]
+        return self.config_manager.has_provider_key(spec.provider)
+
     def _model_label(self, model_name: ModelName, is_current: bool) -> str:
         """Generate label for model with specs and current indicator."""
         if model_name not in MODEL_SPECS:
@@ -188,6 +221,10 @@ class ModelPickerScreen(Screen[None]):
 
         label = f"{display_name} · {input_k}K context · {output_k}K output"
 
+        # Add cost indicator for expensive models
+        if model_name == ModelName.CLAUDE_OPUS_4_1:
+            label += " · Expensive"
+
         if is_current:
             label += " · Current"
 
@@ -198,6 +235,7 @@ class ModelPickerScreen(Screen[None]):
         names = {
             ModelName.GPT_5: "GPT-5 (OpenAI)",
             ModelName.CLAUDE_OPUS_4_1: "Claude Opus 4.1 (Anthropic)",
+            ModelName.CLAUDE_SONNET_4_5: "Claude Sonnet 4.5 (Anthropic)",
             ModelName.GEMINI_2_5_PRO: "Gemini 2.5 Pro (Google)",
         }
         return names.get(model_name, model_name.value)

shotgun/tui/screens/provider_config.py

@@ -9,15 +9,26 @@ from textual.app import ComposeResult
 from textual.containers import Horizontal, Vertical
 from textual.reactive import reactive
 from textual.screen import Screen
-from textual.widgets import Button, Input, Label, ListItem, ListView, Static
+from textual.widgets import Button, Input, Label, ListItem, ListView, Markdown, Static
 
 from shotgun.agents.config import ConfigManager, ProviderType
+from shotgun.utils.env_utils import is_shotgun_account_enabled
 
 if TYPE_CHECKING:
     from ..app import ShotgunApp
 
-# Provider identifiers for configuration screen (LLM providers + Shotgun Account)
-CONFIGURABLE_PROVIDERS = ["openai", "anthropic", "google", "shotgun"]
+
+def get_configurable_providers() -> list[str]:
+    """Get list of configurable providers based on feature flags.
+
+    Returns:
+        List of provider identifiers that can be configured.
+        Includes shotgun only if SHOTGUN_ACCOUNT_ENABLED is set.
+    """
+    providers = ["openai", "anthropic", "google"]
+    if is_shotgun_account_enabled():
+        providers.append("shotgun")
+    return providers
 
 
 class ProviderConfigScreen(Screen[None]):
@@ -50,6 +61,10 @@ class ProviderConfigScreen(Screen[None]):
             color: $text-accent;
         }
 
+        #provider-links {
+            padding: 1 0;
+        }
+
         #provider-list {
             margin: 2 0;
             height: auto;
@@ -81,6 +96,10 @@ class ProviderConfigScreen(Screen[None]):
                 "Select a provider and enter the API key needed to activate it.",
                 id="provider-config-summary",
             )
+            yield Markdown(
+                "Don't have an API Key? Use these links to get one: [OpenAI](https://platform.openai.com/api-keys) | [Anthropic](https://console.anthropic.com) | [Google Gemini](https://aistudio.google.com)",
+                id="provider-links",
+            )
         yield ListView(*self._build_provider_items(), id="provider-list")
         yield Input(
             placeholder=self._input_placeholder(self.selected_provider),
@@ -147,13 +166,13 @@ class ProviderConfigScreen(Screen[None]):
 
     def refresh_provider_status(self) -> None:
         """Update the list view entries to reflect configured providers."""
-        for provider_id in CONFIGURABLE_PROVIDERS:
+        for provider_id in get_configurable_providers():
             label = self.query_one(f"#label-{provider_id}", Label)
             label.update(self._provider_label(provider_id))
 
     def _build_provider_items(self) -> list[ListItem]:
         items: list[ListItem] = []
-        for provider_id in CONFIGURABLE_PROVIDERS:
+        for provider_id in get_configurable_providers():
             label = Label(self._provider_label(provider_id), id=f"label-{provider_id}")
             items.append(ListItem(label, id=f"provider-{provider_id}"))
         return items
@@ -162,7 +181,7 @@ class ProviderConfigScreen(Screen[None]):
         if item is None or item.id is None:
             return None
         provider_id = item.id.removeprefix("provider-")
-        return provider_id if provider_id in CONFIGURABLE_PROVIDERS else None
+        return provider_id if provider_id in get_configurable_providers() else None
 
     def _provider_label(self, provider_id: str) -> str:
         display = self._provider_display_name(provider_id)

shotgun/utils/env_utils.py

@@ -1,5 +1,17 @@
 """Utilities for working with environment variables."""
 
+import os
+
+
+def is_shotgun_account_enabled() -> bool:
+    """Check if Shotgun Account feature is enabled via environment variable.
+
+    Returns:
+        True if SHOTGUN_ACCOUNT_ENABLED is set to a truthy value,
+        False otherwise
+    """
+    return is_truthy(os.environ.get("SHOTGUN_ACCOUNT_ENABLED"))
+
 
 def is_truthy(value: str | None) -> bool:
     """Check if a string value represents true.

{shotgun_sh-0.2.1.dev1.dist-info → shotgun_sh-0.2.1.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.1.dev1
+Version: 0.2.1.dev3
 Summary: AI-powered research, planning, and task management CLI tool
 Project-URL: Homepage, https://shotgun.sh/
 Project-URL: Repository, https://github.com/shotgun-sh/shotgun
@@ -22,6 +22,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.11
 Requires-Dist: anthropic>=0.39.0
+Requires-Dist: genai-prices>=0.0.27
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: jinja2>=3.1.0
 Requires-Dist: kuzu>=0.7.0

{shotgun_sh-0.2.1.dev1.dist-info → shotgun_sh-0.2.1.dev3.dist-info}/RECORD

@@ -7,23 +7,24 @@ shotgun/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/sentry_telemetry.py,sha256=L7jFMNAnDIENWVeQYSLpyul2nmIm2w3wnOp2kDP_cic,2902
 shotgun/telemetry.py,sha256=Ves6Ih3hshpKVNVAUUmwRdtW8NkTjFPg8hEqvFKZ0t0,3208
 shotgun/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
-shotgun/agents/agent_manager.py,sha256=wXUQCEsSs68FG8edFLryeePBzxxX1GStJZwd1sS5WsE,26245
+shotgun/agents/agent_manager.py,sha256=xq8L0oAFgtFCpKVsyUoMtYJqUyz5XxjWLKNnxoe1zo4,26577
 shotgun/agents/common.py,sha256=Hr9HigsDopkI0Sr3FThGDv1f67NLemOjcYA6LV9v970,18963
 shotgun/agents/conversation_history.py,sha256=5J8_1yxdZiiWTq22aDio88DkBDZ4_Lh_p5Iy5_ENszc,3898
 shotgun/agents/conversation_manager.py,sha256=fxAvXbEl3Cl2ugJ4N9aWXaqZtkrnfj3QzwjWC4LFXwI,3514
 shotgun/agents/export.py,sha256=Zke952DbJ_lOBUmN-TPHw7qmjbfqsFu1uycBRQI_pkg,2969
 shotgun/agents/llm.py,sha256=hs8j1wwTczGtehzahL1Z_5D4qus5QUx4-h9-m5ZPzm4,2209
 shotgun/agents/messages.py,sha256=wNn0qC5AqASM8LMaSGFOerZEJPn5FsIOmaJs1bdosuU,1036
-shotgun/agents/models.py,sha256=n4N141QOPmcuFjJkn5uZRAvtVwF1acsAJE8QlQABCiM,7845
+shotgun/agents/models.py,sha256=IvwwjbJYi5wi9S-budg8g1ezi1VaO57Q-XtegkbTrXg,8096
 shotgun/agents/plan.py,sha256=s-WfILBOW4l8kY59RUOVtX5MJSuSzFm1nGp6b17If78,3030
 shotgun/agents/research.py,sha256=lYG7Rytcitop8mXs3isMI3XvYzzI3JH9u0VZz6K9zfo,3274
 shotgun/agents/specify.py,sha256=7MoMxfIn34G27mw6wrp_F0i2O5rid476L3kHFONDCd0,3137
 shotgun/agents/tasks.py,sha256=nk8zIl24o01hfzOGyWSbeVWeke6OGseO4Ppciurh13U,2999
+shotgun/agents/usage_manager.py,sha256=5d9JC4_cthXwhTSytMfMExMDAUYp8_nkPepTJZXk13w,5017
 shotgun/agents/config/__init__.py,sha256=Fl8K_81zBpm-OfOW27M_WWLSFdaHHek6lWz95iDREjQ,318
 shotgun/agents/config/constants.py,sha256=I3f0ueoQaTg5HddXGCYimCYpj-U57z3IBQYIVJxVIhg,872
-shotgun/agents/config/manager.py,sha256=phm_oqObIrCGJrZUvVbwSJHB--Mn7zqJLWB9ZWok5lY,15042
-shotgun/agents/config/models.py,sha256=h1XqPOh66moIYaXtEyoGJuPLXdD3acVCOgvgrELsS_4,4796
-shotgun/agents/config/provider.py,sha256=V4s7HwU3XwCWqmvMPoDiG9pVjUuuyNWidvqhImLXvxE,11547
+shotgun/agents/config/manager.py,sha256=6WT4xaAfJTyYxpQ9AcMYHG1cjySNmtJDgTzVmqIAMpc,14503
+shotgun/agents/config/models.py,sha256=ZojhfheNO337e1icy_cE2PpBXIl5oHkdajr4azzFF-U,5106
+shotgun/agents/config/provider.py,sha256=_HkmN4WhGcZgtAuaF-RA6ZEOiWQ0oWLufZDxl-3rnn4,10935
 shotgun/agents/history/__init__.py,sha256=XFQj2a6fxDqVg0Q3juvN9RjV_RJbgvFZtQOCOjVJyp4,147
 shotgun/agents/history/compaction.py,sha256=9RMpG0aY_7L4TecbgwHSOkGtbd9W5XZTg-MbzZmNl00,3515
 shotgun/agents/history/constants.py,sha256=yWY8rrTZarLA3flCCMB_hS2NMvUDRDTwP4D4j7MIh1w,446
@@ -50,14 +51,14 @@ shotgun/agents/tools/codebase/models.py,sha256=8eR3_8DQiBNgB2twu0aC_evIJbugN9KW3
 shotgun/agents/tools/codebase/query_graph.py,sha256=vOeyN4-OZj-vpTSk3Z9W5TjraZAepJ-Qjk_zzvum3fU,2115
 shotgun/agents/tools/codebase/retrieve_code.py,sha256=2VjiqVKJMd9rPV-mGrL4C-N8fqGjYLW6ZInFGbcTxOM,2878
 shotgun/agents/tools/web_search/__init__.py,sha256=_9rgs_gv41-wfPvwfWM_Qfq-zvboyQ_srfyneGsxgM4,3182
-shotgun/agents/tools/web_search/anthropic.py,sha256=wN3dRBXohIwcJRp0KA3QTgldGjKuDZ2NW4X36mvIn3E,4971
+shotgun/agents/tools/web_search/anthropic.py,sha256=GelAhAmb-b4o87-3sgxNFfw-G2LXDEjfdZ7XfF0bQD0,4983
 shotgun/agents/tools/web_search/gemini.py,sha256=-fI_deaBT4-_61A7KlKtz8tmKXW50fVx_97WAJTUg4w,3468
 shotgun/agents/tools/web_search/openai.py,sha256=pnIcTV3vwXJQuxPs4I7gQNX18XzM7D7FqeNxnn1E7yw,3437
 shotgun/agents/tools/web_search/utils.py,sha256=GLJ5QV9bT2ubFMuFN7caMN7tK9OTJ0R3GD57B-tCMF0,532
 shotgun/cli/__init__.py,sha256=_F1uW2g87y4bGFxz8Gp8u7mq2voHp8vQIUtCmm8Tojo,40
-shotgun/cli/config.py,sha256=wQhuz8zE2K-fjwxeK2yZt-NkV13kEZAitBqrwPLUvgg,7466
+shotgun/cli/config.py,sha256=Lrcqxm7W7I6g6iP_K5-yK7QFOgcYt5KIc8A6Wit1Ksg,7835
 shotgun/cli/export.py,sha256=3hIwK2_OM1MFYSTfzBxsGuuBGm5fo0XdxASfQ5Uqb3Y,2471
-shotgun/cli/feedback.py,sha256=Sh0aK93wE7rvvCI31QCbm0sU-AUEldg7s9QqoAm1oQM,1242
+shotgun/cli/feedback.py,sha256=Me1dQQgkYwP4AIFwYgfHcPXxFdJ6CzFbCBttKcFd2Q0,1238
 shotgun/cli/models.py,sha256=kwZEldQWUheNsqF_ezgDzRBc6h0Y0JxFw1VMQjZlvPE,182
 shotgun/cli/plan.py,sha256=T-eu-I9z-dSoKqJ-KI8X5i5Mm0VL1BfornxRiUjTgnk,2324
 shotgun/cli/research.py,sha256=qvBBtX3Wyn6pDZlJpcEvbeK-0iTOXegi71tm8HKVYaE,2490
@@ -113,7 +114,7 @@ shotgun/sdk/exceptions.py,sha256=qBcQv0v7ZTwP7CMcxZST4GqCsfOWtOUjSzGBo0-heqo,412
 shotgun/sdk/models.py,sha256=X9nOTUHH0cdkQW1NfnMEDu-QgK9oUsEISh1Jtwr5Am4,5496
 shotgun/sdk/services.py,sha256=J4PJFSxCQ6--u7rb3Ta-9eYtlYcxcbnzrMP6ThyCnw4,705
 shotgun/tui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shotgun/tui/app.py,sha256=Rv4Pxi2uyDE_tspZGMWKJY1KrH47d8uCIBBMfM05gCQ,5093
+shotgun/tui/app.py,sha256=DrULqhxPPDZzz1WQNjXDY_cls4kXJNexYlI1ISrNTKs,5089
 shotgun/tui/filtered_codebase_service.py,sha256=lJ8gTMhIveTatmvmGLP299msWWTkVYKwvY_2FhuL2s4,1687
 shotgun/tui/styles.tcss,sha256=ETyyw1bpMBOqTi5RLcAJUScdPWTvAWEqE9YcT0kVs_E,121
 shotgun/tui/commands/__init__.py,sha256=8D5lvtpqMW5-fF7Bg3oJtUzU75cKOv6aUaHYYszydU8,2518
@@ -121,26 +122,26 @@ shotgun/tui/components/prompt_input.py,sha256=Ss-htqraHZAPaehGE4x86ij0veMjc4Ugad
 shotgun/tui/components/spinner.py,sha256=ovTDeaJ6FD6chZx_Aepia6R3UkPOVJ77EKHfRmn39MY,2427
 shotgun/tui/components/splash.py,sha256=vppy9vEIEvywuUKRXn2y11HwXSRkQZHLYoVjhDVdJeU,1267
 shotgun/tui/components/vertical_tail.py,sha256=kROwTaRjUwVB7H35dtmNcUVPQqNYvvfq7K2tXBKEb6c,638
-shotgun/tui/screens/chat.py,sha256=HIDnqt8og2KMmtdOok1lL44130M8V7IP6Un_8HcRwsA,30178
+shotgun/tui/screens/chat.py,sha256=CqAv_x6R4zl-MGbtg8KgZWt8OhpBJYpx5gGBQ3oxqgw,30313
 shotgun/tui/screens/chat.tcss,sha256=2Yq3E23jxsySYsgZf4G1AYrYVcpX0UDW6kNNI0tDmtM,437
 shotgun/tui/screens/directory_setup.py,sha256=lIZ1J4A6g5Q2ZBX8epW7BhR96Dmdcg22CyiM5S-I5WU,3237
 shotgun/tui/screens/feedback.py,sha256=cYtmuM3qqKwevstu8gJ9mmk7lkIKZvfAyDEBUOLh-yI,5660
-shotgun/tui/screens/model_picker.py,sha256=2l0zkhJ5CPH_4Fn0MM3bp9RN7fEowbljpBsmTjzRQT8,6886
-shotgun/tui/screens/provider_config.py,sha256=-en99fDxTim0DSjpJTLSRba_yrON8wDhcuwU6rNZwHM,7765
+shotgun/tui/screens/model_picker.py,sha256=ZutEz4w_BJkGGwwdJSj7-kPdIPzmK6ZDHYkEA0q596A,8625
+shotgun/tui/screens/provider_config.py,sha256=pDJKjvl_els-XrbRTwBBDDL0jo_uRa7DMTAZJAJ9NXA,8461
 shotgun/tui/screens/splash.py,sha256=E2MsJihi3c9NY1L28o_MstDxGwrCnnV7zdq00MrGAsw,706
 shotgun/tui/screens/chat_screen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shotgun/tui/screens/chat_screen/command_providers.py,sha256=B4uUzzGq23vfS1mp4U6zsOEqyv6Ni9AMu5fqp5xMz5s,8437
+shotgun/tui/screens/chat_screen/command_providers.py,sha256=qAY09_pKxcTyxJHy9Rlwhs1tAW5QMWXxDwnpparnQmI,12542
 shotgun/tui/screens/chat_screen/hint_message.py,sha256=WOpbk8q7qt7eOHTyyHvh_IQIaublVDeJGaLpsxEk9FA,933
-shotgun/tui/screens/chat_screen/history.py,sha256=NVLA3_tERTyB4vkH71w8ef_M5CszfkwbQOuMb100Fzc,12272
+shotgun/tui/screens/chat_screen/history.py,sha256=Go859iEjw0s5aELKpF42MjLXy7UFQ52XnJMTIkV3aLo,12406
 shotgun/tui/utils/__init__.py,sha256=cFjDfoXTRBq29wgP7TGRWUu1eFfiIG-LLOzjIGfadgI,150
 shotgun/tui/utils/mode_progress.py,sha256=lseRRo7kMWLkBzI3cU5vqJmS2ZcCjyRYf9Zwtvc-v58,10931
 shotgun/utils/__init__.py,sha256=WinIEp9oL2iMrWaDkXz2QX4nYVPAm8C9aBSKTeEwLtE,198
-shotgun/utils/env_utils.py,sha256=8QK5aw_f_V2AVTleQQlcL0RnD4sPJWXlDG46fsHu0d8,1057
+shotgun/utils/env_utils.py,sha256=5spVCdeqVKtlWoKocPhz_5j_iRN30neqcGUzUuiWmfc,1365
 shotgun/utils/file_system_utils.py,sha256=l-0p1bEHF34OU19MahnRFdClHufThfGAjQ431teAIp0,1004
 shotgun/utils/source_detection.py,sha256=Co6Q03R3fT771TF3RzB-70stfjNP2S4F_ArZKibwzm8,454
 shotgun/utils/update_checker.py,sha256=IgzPHRhS1ETH7PnJR_dIx6lxgr1qHpCkMTgzUxvGjhI,7586
-shotgun_sh-0.2.1.dev1.dist-info/METADATA,sha256=KnWsl_ASqmh5tc4yblK9TGGltQxztoW_XYK7fNPCLqE,11190
-shotgun_sh-0.2.1.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.1.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.1.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.1.dev1.dist-info/RECORD,,
+shotgun_sh-0.2.1.dev3.dist-info/METADATA,sha256=f_1fWjFpf7SbFyTIidsUTAgsu4wQSTn2QrH_3fE9ibA,11226
+shotgun_sh-0.2.1.dev3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.1.dev3.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.1.dev3.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.1.dev3.dist-info/RECORD,,