shotgun-sh 0.2.3.dev2__py3-none-any.whl → 0.2.4.dev1__py3-none-any.whl

shotgun/agents/config/manager.py

@@ -256,9 +256,16 @@ class ConfigManager:
         config = self.load()
 
         # Get provider config (shotgun or LLM provider)
-        provider_config, _ = self._get_provider_config_and_type(config, provider)
+        provider_config, is_shotgun = self._get_provider_config_and_type(
+            config, provider
+        )
 
         provider_config.api_key = None
+
+        # For Shotgun Account, also clear the JWT
+        if is_shotgun and isinstance(provider_config, ShotgunAccountConfig):
+            provider_config.supabase_jwt = None
+
         self.save(config)
 
     def update_selected_model(self, model_name: "ModelName") -> None:

shotgun/agents/config/provider.py

@@ -10,7 +10,10 @@ from pydantic_ai.providers.google import GoogleProvider
 from pydantic_ai.providers.openai import OpenAIProvider
 from pydantic_ai.settings import ModelSettings
 
-from shotgun.llm_proxy import create_litellm_provider
+from shotgun.llm_proxy import (
+    create_anthropic_proxy_provider,
+    create_litellm_provider,
+)
 from shotgun.logging_config import get_logger
 
 from .manager import get_config_manager
@@ -72,19 +75,37 @@ def get_or_create_model(
 
         # Use LiteLLM proxy for Shotgun Account, native providers for BYOK
         if key_provider == KeyProvider.SHOTGUN:
-            # Shotgun Account uses LiteLLM proxy for any model
+            # Shotgun Account uses LiteLLM proxy with native model types where possible
             if model_name in MODEL_SPECS:
                 litellm_model_name = MODEL_SPECS[model_name].litellm_proxy_model_name
             else:
                 # Fallback for unmapped models
                 litellm_model_name = f"openai/{model_name.value}"
 
-            litellm_provider = create_litellm_provider(api_key)
-            _model_cache[cache_key] = OpenAIChatModel(
-                litellm_model_name,
-                provider=litellm_provider,
-                settings=ModelSettings(max_tokens=max_tokens),
-            )
+            # Use native provider types to preserve API formats and features
+            if provider == ProviderType.ANTHROPIC:
+                # Anthropic: Use native AnthropicProvider with /anthropic endpoint
+                # This preserves Anthropic-specific features like tool_choice
+                # Note: Web search for Shotgun Account uses Gemini only (not Anthropic)
+                # Note: Anthropic API expects model name without prefix (e.g., "claude-sonnet-4-5")
+                anthropic_provider = create_anthropic_proxy_provider(api_key)
+                _model_cache[cache_key] = AnthropicModel(
+                    model_name.value,  # Use model name without "anthropic/" prefix
+                    provider=anthropic_provider,
+                    settings=AnthropicModelSettings(
+                        max_tokens=max_tokens,
+                        timeout=600,  # 10 minutes timeout for large responses
+                    ),
+                )
+            else:
+                # OpenAI and Google: Use LiteLLMProvider (OpenAI-compatible format)
+                # Google's GoogleProvider doesn't support base_url, so use LiteLLM
+                litellm_provider = create_litellm_provider(api_key)
+                _model_cache[cache_key] = OpenAIChatModel(
+                    litellm_model_name,
+                    provider=litellm_provider,
+                    settings=ModelSettings(max_tokens=max_tokens),
+                )
         elif key_provider == KeyProvider.BYOK:
             # Use native provider implementations with user's API keys
             if provider == ProviderType.OPENAI:
@@ -145,13 +166,19 @@ def get_provider_model(
     # Priority 1: Check if Shotgun key exists - if so, use it for ANY model
     shotgun_api_key = _get_api_key(config.shotgun.api_key)
     if shotgun_api_key:
-        # Use selected model or default to claude-sonnet-4-5
-        model_name = config.selected_model or ModelName.CLAUDE_SONNET_4_5
+        # Determine which model to use
+        if isinstance(provider_or_model, ModelName):
+            # Specific model requested - honor it (e.g., web search tools)
+            model_name = provider_or_model
+        else:
+            # No specific model requested - use selected or default
+            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]
 
-        # Use Shotgun Account with selected model (provider = actual LLM provider)
+        # Use Shotgun Account with determined model (provider = actual LLM provider)
         return ModelConfig(
             name=spec.name,
             provider=spec.provider,  # Actual LLM provider (OPENAI/ANTHROPIC/GOOGLE)

shotgun/agents/history/token_counting/anthropic.py

@@ -3,7 +3,7 @@
 from pydantic_ai.messages import ModelMessage
 
 from shotgun.agents.config.models import KeyProvider
-from shotgun.llm_proxy import create_anthropic_proxy_client
+from shotgun.llm_proxy import create_anthropic_proxy_provider
 from shotgun.logging_config import get_logger
 
 from .base import TokenCounter, extract_text_from_messages
@@ -36,19 +36,20 @@ class AnthropicTokenCounter(TokenCounter):
         try:
             if key_provider == KeyProvider.SHOTGUN:
                 # Use LiteLLM proxy for Shotgun Account
-                # Proxies to Anthropic's token counting API
-                self.client = create_anthropic_proxy_client(api_key)
+                # Get async client from AnthropicProvider
+                provider = create_anthropic_proxy_provider(api_key)
+                self.client = provider.client
                 logger.debug(
-                    f"Initialized Anthropic token counter for {model_name} via LiteLLM proxy"
+                    f"Initialized async Anthropic token counter for {model_name} via LiteLLM proxy"
                 )
             else:
-                # Direct Anthropic API for BYOK
-                self.client = anthropic.Anthropic(api_key=api_key)
+                # Direct Anthropic API for BYOK - use async client
+                self.client = anthropic.AsyncAnthropic(api_key=api_key)
                 logger.debug(
-                    f"Initialized Anthropic token counter for {model_name} via direct API"
+                    f"Initialized async Anthropic token counter for {model_name} via direct API"
                 )
         except Exception as e:
-            raise RuntimeError("Failed to initialize Anthropic client") from e
+            raise RuntimeError("Failed to initialize Anthropic async client") from e
 
     async def count_tokens(self, text: str) -> int:
         """Count tokens using Anthropic's official API (async).
@@ -64,7 +65,8 @@ class AnthropicTokenCounter(TokenCounter):
         """
         try:
             # Anthropic API expects messages format and model parameter
-            result = self.client.messages.count_tokens(
+            # Use await with async client
+            result = await self.client.messages.count_tokens(
                 messages=[{"role": "user", "content": text}], model=self.model_name
             )
             return result.input_tokens

shotgun/agents/tools/web_search/__init__.py

@@ -3,7 +3,10 @@
 Provides web search capabilities for multiple LLM providers:
 - OpenAI: Uses Responses API with web_search tool (BYOK only)
 - Anthropic: Uses Messages API with web_search_20250305 tool (BYOK only)
-- Gemini: Uses grounding with Google Search via Pydantic AI (works with Shotgun Account)
+- Gemini: Uses grounding with Google Search via Pydantic AI (Shotgun Account and BYOK)
+
+Shotgun Account: Only Gemini web search is available
+BYOK: All tools work with direct provider API keys
 """
 
 from collections.abc import Awaitable, Callable
@@ -26,11 +29,12 @@ WebSearchTool = Callable[[str], Awaitable[str]]
 def get_available_web_search_tools() -> list[WebSearchTool]:
     """Get list of available web search tools based on configured API keys.
 
-    When using Shotgun Account (via LiteLLM proxy):
-        Only Gemini web search is available (others use provider-specific APIs)
+    Works with both Shotgun Account (via LiteLLM proxy) and BYOK (individual provider keys).
 
-    When using BYOK (individual provider keys):
-        All provider tools are available based on their respective keys
+    Available tools:
+    - Gemini: Available for both Shotgun Account and BYOK
+    - Anthropic: BYOK only (uses Messages API with web search)
+    - OpenAI: BYOK only (uses Responses API not compatible with LiteLLM proxy)
 
     Returns:
         List of web search tool functions that have API keys configured
@@ -43,15 +47,23 @@ def get_available_web_search_tools() -> list[WebSearchTool]:
     has_shotgun_key = config.shotgun.api_key is not None
 
     if has_shotgun_key:
-        # Shotgun Account mode: Only Gemini supports web search via LiteLLM
+        logger.debug("🔑 Shotgun Account - only Gemini web search available")
+
+        # Gemini: Only search tool available for Shotgun Account
         if is_provider_available(ProviderType.GOOGLE):
-            logger.info("🔑 Shotgun Account detected - using Gemini web search only")
-            logger.debug("   OpenAI and Anthropic web search require direct API keys")
+            logger.debug("✅ Gemini web search tool available")
             tools.append(gemini_web_search_tool)
-        else:
-            logger.warning(
-                "⚠️ Shotgun Account configured but no Gemini key - "
-                "web search unavailable"
+
+        # Anthropic: Not available for Shotgun Account (Gemini-only for Shotgun)
+        if is_provider_available(ProviderType.ANTHROPIC):
+            logger.debug(
+                "⚠️  Anthropic web search requires BYOK (Shotgun Account uses Gemini only)"
+            )
+
+        # OpenAI: Not available for Shotgun Account (Responses API incompatible with proxy)
+        if is_provider_available(ProviderType.OPENAI):
+            logger.debug(
+                "⚠️  OpenAI web search requires BYOK (Responses API not supported via proxy)"
             )
     else:
         # BYOK mode: Load all available tools based on individual provider keys

shotgun/llm_proxy/__init__.py

@@ -1,6 +1,9 @@
 """LiteLLM proxy client utilities and configuration."""
 
-from .clients import create_anthropic_proxy_client, create_litellm_provider
+from .clients import (
+    create_anthropic_proxy_provider,
+    create_litellm_provider,
+)
 from .constants import (
     LITELLM_PROXY_ANTHROPIC_BASE,
     LITELLM_PROXY_BASE_URL,
@@ -12,5 +15,5 @@ __all__ = [
     "LITELLM_PROXY_ANTHROPIC_BASE",
     "LITELLM_PROXY_OPENAI_BASE",
     "create_litellm_provider",
-    "create_anthropic_proxy_client",
+    "create_anthropic_proxy_provider",
 ]

shotgun/llm_proxy/clients.py

@@ -1,6 +1,6 @@
 """Client creation utilities for LiteLLM proxy."""
 
-from anthropic import Anthropic
+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
@@ -21,19 +21,24 @@ def create_litellm_provider(api_key: str) -> LiteLLMProvider:
     )
 
 
-def create_anthropic_proxy_client(api_key: str) -> Anthropic:
-    """Create Anthropic client configured for LiteLLM proxy.
+def create_anthropic_proxy_provider(api_key: str) -> AnthropicProvider:
+    """Create Anthropic provider configured for LiteLLM proxy.
 
-    This client will proxy token counting requests through the
-    LiteLLM proxy to Anthropic's actual token counting API.
+    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:
-        Anthropic client configured to use LiteLLM proxy
+        AnthropicProvider configured to use LiteLLM proxy /anthropic endpoint
     """
-    return Anthropic(
+    return AnthropicProvider(
         api_key=api_key,
         base_url=LITELLM_PROXY_ANTHROPIC_BASE,
     )

shotgun/tui/screens/welcome.py

@@ -136,6 +136,12 @@ class WelcomeScreen(Screen[None]):
 
     def on_mount(self) -> None:
         """Focus the first button on mount."""
+        # Update BYOK button text based on whether user has existing providers
+        byok_button = self.query_one("#byok-button", Button)
+        app = cast("ShotgunApp", self.app)
+        if app.config_manager.has_any_provider_key():
+            byok_button.label = "I'll stick with my BYOK setup"
+
         self.query_one("#shotgun-button", Button).focus()
 
     @on(Button.Pressed, "#shotgun-button")
@@ -147,13 +153,18 @@ class WelcomeScreen(Screen[None]):
     def _on_byok_pressed(self) -> None:
         """Handle BYOK button press."""
         self._mark_welcome_shown()
-        # Push provider config screen before dismissing
+
+        app = cast("ShotgunApp", self.app)
+
+        # If user already has providers, just dismiss and continue to chat
+        if app.config_manager.has_any_provider_key():
+            self.dismiss()
+            return
+
+        # Otherwise, push provider config screen
         from .provider_config import ProviderConfigScreen
 
-        self.app.push_screen(
-            ProviderConfigScreen(),
-            callback=lambda _arg: self.dismiss(),
-        )
+        self.app.push_screen(ProviderConfigScreen())
 
     async def _start_shotgun_auth(self) -> None:
         """Launch Shotgun Account authentication flow."""

{shotgun_sh-0.2.3.dev2.dist-info → shotgun_sh-0.2.4.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.3.dev2
+Version: 0.2.4.dev1
 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.3.dev2.dist-info → shotgun_sh-0.2.4.dev1.dist-info}/RECORD

@@ -23,9 +23,9 @@ 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=JNuLpeBUKikEsxGSjwX3RVWUQpbCKnDKstF2NczuDqk,932
-shotgun/agents/config/manager.py,sha256=TeGl8n-gFLtphCjoGEma4Ej4JyltWXOJj-okYLi_INk,18491
+shotgun/agents/config/manager.py,sha256=AR3ENgt9zsJSyswOzc8XrnNIiMuq5hCbjU4n6S2ud4I,18699
 shotgun/agents/config/models.py,sha256=ohLXt9niCy4uFfFP1E6WSBZtxh7aZ16gTA2S3pHYkmc,5431
-shotgun/agents/config/provider.py,sha256=TwwZC_BtYSOpN2jdX6WZdor29EnAqfMoQK5GmNEYaPI,11012
+shotgun/agents/config/provider.py,sha256=K2uW7DkdAhZfoDJcWV7NxOrSoEq1rQzArtZnxIgEe3E,12496
 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
@@ -35,7 +35,7 @@ shotgun/agents/history/history_processors.py,sha256=D3z-hzrXHxE7OAZaVX4_YAKN_nyx
 shotgun/agents/history/message_utils.py,sha256=aPusAl2RYKbjc7lBxPaNprRHmZEG6fe97q7DQUlhlzU,2918
 shotgun/agents/history/token_estimation.py,sha256=iRyKq-YDivEpJrULIbQgNpjhOuSC4nHVJYfsWEFV8sQ,4770
 shotgun/agents/history/token_counting/__init__.py,sha256=YZt5Lus--fkF6l1hdkIlp1e_oAIpACNwHOI0FRP4q8s,924
-shotgun/agents/history/token_counting/anthropic.py,sha256=b2LvwKM4dSILGhv_-W4mLMKMUCPLhe1ov9UGW_-iBsw,3011
+shotgun/agents/history/token_counting/anthropic.py,sha256=fdRmm91od814mH1fSCv0WxmivEOy8xmcDIXJum1JaiE,3146
 shotgun/agents/history/token_counting/base.py,sha256=TN4mzwSyWNQyTuOuCFaU-8AgLdAyquoX3af4qrmkxCs,1904
 shotgun/agents/history/token_counting/openai.py,sha256=XJ2z2HaUG6f3Cw9tCK_yaOsaMJGHpSFF1I30-d3soSI,2350
 shotgun/agents/history/token_counting/sentencepiece_counter.py,sha256=qj1bT7J5nCd5y6Mr42O9K1KTaele0rjdd09FeyyEA70,3987
@@ -51,7 +51,7 @@ shotgun/agents/tools/codebase/file_read.py,sha256=EGK5yNqiS4cbIEQfDtdKVoJSJYk20N
 shotgun/agents/tools/codebase/models.py,sha256=8eR3_8DQiBNgB2twu0aC_evIJbugN9KW3gtxMZdGYCE,10087
 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/__init__.py,sha256=166SzGDspEqRoHvAoguoy02WAT5EQfozoc5Ha5VubdY,3699
 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
@@ -82,8 +82,8 @@ shotgun/codebase/core/language_config.py,sha256=vsqHyuFnumRPRBV1lMOxWKNOIiClO6Fy
 shotgun/codebase/core/manager.py,sha256=kjxQ9eCs5vVCVDproCN1eYSKuGiqtcxF01reQ18JfOw,66184
 shotgun/codebase/core/nl_query.py,sha256=kPoSJXBlm5rLhzOofZhqPVMJ_Lj3rV2H6sld6BwtMdg,16115
 shotgun/codebase/core/parser_loader.py,sha256=LZRrDS8Sp518jIu3tQW-BxdwJ86lnsTteI478ER9Td8,4278
-shotgun/llm_proxy/__init__.py,sha256=BLD9NnVzdD0H7gFb65Ajud-Q7SiCymegLRaGx8UkC-Y,435
-shotgun/llm_proxy/clients.py,sha256=wP4UlgtCdrNwWsZLZ9inE3fEIDa-i1j7gsr9oXQf1o4,1037
+shotgun/llm_proxy/__init__.py,sha256=3ST3ygtf2sXXSOjIFHxVZ5xqRbT3TF7jpNHwuZAtIwA,452
+shotgun/llm_proxy/clients.py,sha256=Y19W8Gb2e-37w8rUKPmxJOqoTk6GlcPhZhoeAbbURU0,1341
 shotgun/llm_proxy/constants.py,sha256=_4piKdyvM7pAIRdAGrzYexwWoDlueUZiEMfwWrOa4T0,381
 shotgun/prompts/__init__.py,sha256=RswUm0HMdfm2m2YKUwUsEdRIwoczdbI7zlucoEvHYRo,132
 shotgun/prompts/loader.py,sha256=jy24-E02pCSmz2651aCT2NgHfRrHAGMYvKrD6gs0Er8,4424
@@ -135,7 +135,7 @@ shotgun/tui/screens/model_picker.py,sha256=G-EvalpxgHKk0W3FgHMcxIr817VwZyEgh_Zad
 shotgun/tui/screens/provider_config.py,sha256=UCnAzjXPoP7Y73gsXxZF2PNA4LdSgpgoGYwiOd6fERA,10902
 shotgun/tui/screens/shotgun_auth.py,sha256=Y--7LZewV6gfDkucxymfAO7BCd7eI2C3H1ClDMztVio,10663
 shotgun/tui/screens/splash.py,sha256=E2MsJihi3c9NY1L28o_MstDxGwrCnnV7zdq00MrGAsw,706
-shotgun/tui/screens/welcome.py,sha256=cpsBK2Gy99Nz7rwZhxVn310G68TjSdGXpIXGRp7DoLY,5329
+shotgun/tui/screens/welcome.py,sha256=r-RjtzjMhAaA0XKgnYKdZOuE07bcBi223fleKEf-Faw,5772
 shotgun/tui/screens/chat_screen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/tui/screens/chat_screen/command_providers.py,sha256=7Xnxd4k30bpLOMZSX32bcugU4IgpqU4Y8f6eHWKXd4o,12694
 shotgun/tui/screens/chat_screen/hint_message.py,sha256=WOpbk8q7qt7eOHTyyHvh_IQIaublVDeJGaLpsxEk9FA,933
@@ -147,8 +147,8 @@ shotgun/utils/env_utils.py,sha256=ulM3BRi9ZhS7uC-zorGeDQm4SHvsyFuuU9BtVPqdrHY,14
 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.3.dev2.dist-info/METADATA,sha256=83cmMLDU0Zfx2TiRiX6cbJ6goC6i9cP6YmxvKI5hdzE,11226
-shotgun_sh-0.2.3.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.3.dev2.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.3.dev2.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.3.dev2.dist-info/RECORD,,
+shotgun_sh-0.2.4.dev1.dist-info/METADATA,sha256=R13OhYSbeSg9EqpiXR5o2s8MQr2uflp44Adqwnn8hxc,11226
+shotgun_sh-0.2.4.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.4.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.4.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.4.dev1.dist-info/RECORD,,