shotgun-sh 0.2.1.dev2__tar.gz → 0.2.1.dev3__tar.gz

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.1.dev2
+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

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shotgun-sh"
-version = "0.2.1.dev2"
+version = "0.2.1.dev3"
 description = "AI-powered research, planning, and task management CLI tool"
 readme = "README.md"
 license = { text = "MIT" }

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/shotgun/agents/config/manager.py

@@ -109,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,
                             }
 
@@ -210,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:

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/shotgun/agents/config/provider.py

@@ -219,8 +219,8 @@ def get_provider_model(
         if not api_key:
             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]

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/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_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/shotgun/tui/screens/chat.py

@@ -54,11 +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,
-    UsageProvider,
+    UnifiedCommandProvider,
 )
 
 logger = logging.getLogger(__name__)
@@ -233,10 +230,7 @@ class ChatScreen(Screen[None]):
     ]
 
     COMMANDS = {
-        AgentModeProvider,
-        ProviderSetupProvider,
-        CodebaseCommandProvider,
-        UsageProvider,
+        UnifiedCommandProvider,
     }
 
     value = reactive("")

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/shotgun/tui/screens/chat_screen/command_providers.py

@@ -191,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)
@@ -269,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_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/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_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/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"
 

{shotgun_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/shotgun/tui/screens/provider_config.py

@@ -12,12 +12,23 @@ from textual.screen import Screen
 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]):
@@ -155,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
@@ -170,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_sh-0.2.1.dev2 → shotgun_sh-0.2.1.dev3}/src/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.