shotgun-sh 0.2.2.dev1__py3-none-any.whl → 0.2.3__py3-none-any.whl

shotgun/agents/config/manager.py

@@ -81,6 +81,26 @@ class ConfigManager:
                     "Migrated config v2->v3: renamed user_id to shotgun_instance_id"
                 )
 
+            # Migration: Set shown_welcome_screen for existing BYOK users
+            # If shown_welcome_screen doesn't exist AND any BYOK provider has a key,
+            # set it to False so they see the welcome screen once
+            if "shown_welcome_screen" not in data:
+                has_byok_key = False
+                for section in ["openai", "anthropic", "google"]:
+                    if (
+                        section in data
+                        and isinstance(data[section], dict)
+                        and data[section].get("api_key")
+                    ):
+                        has_byok_key = True
+                        break
+
+                if has_byok_key:
+                    data["shown_welcome_screen"] = False
+                    logger.info(
+                        "Existing BYOK user detected: set shown_welcome_screen=False to show welcome screen"
+                    )
+
             # Convert plain text secrets to SecretStr objects
             self._convert_secrets_to_secretstr(data)
 
@@ -236,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/api_endpoints.py

@@ -0,0 +1,11 @@
+"""Shotgun backend service API endpoints and URLs."""
+
+# Shotgun Web API base URL (for authentication/subscription)
+# Can be overridden with environment variable
+SHOTGUN_WEB_BASE_URL = "https://api-219702594231.us-east4.run.app"
+# Shotgun's LiteLLM proxy base URL (for AI model requests)
+LITELLM_PROXY_BASE_URL = "https://litellm-219702594231.us-east4.run.app"
+
+# Provider-specific LiteLLM proxy endpoints
+LITELLM_PROXY_ANTHROPIC_BASE = f"{LITELLM_PROXY_BASE_URL}/anthropic"
+LITELLM_PROXY_OPENAI_BASE = LITELLM_PROXY_BASE_URL

shotgun/build_constants.py

@@ -12,8 +12,8 @@ POSTHOG_API_KEY = ''
 POSTHOG_PROJECT_ID = '191396'
 
 # Logfire configuration embedded at build time (only for dev builds)
-LOGFIRE_ENABLED = 'true'
-LOGFIRE_TOKEN = 'pylf_v1_us_KZ5NM1pP3NwgJkbBJt6Ftdzk8mMhmrXcGJHQQgDJ1LfK'
+LOGFIRE_ENABLED = ''
+LOGFIRE_TOKEN = ''
 
 # Build metadata
 BUILD_TIME_ENV = "production" if SENTRY_DSN else "development"

shotgun/llm_proxy/constants.py

@@ -1,8 +1,15 @@
 """LiteLLM proxy constants and configuration."""
 
-# Shotgun's LiteLLM proxy base URL
-LITELLM_PROXY_BASE_URL = "https://litellm-701197220809.us-east1.run.app"
+# Import from centralized API endpoints module
+from shotgun.api_endpoints import (
+    LITELLM_PROXY_ANTHROPIC_BASE,
+    LITELLM_PROXY_BASE_URL,
+    LITELLM_PROXY_OPENAI_BASE,
+)
 
-# Provider-specific endpoints
-LITELLM_PROXY_ANTHROPIC_BASE = f"{LITELLM_PROXY_BASE_URL}/anthropic"
-LITELLM_PROXY_OPENAI_BASE = LITELLM_PROXY_BASE_URL
+# Re-export for backward compatibility
+__all__ = [
+    "LITELLM_PROXY_BASE_URL",
+    "LITELLM_PROXY_ANTHROPIC_BASE",
+    "LITELLM_PROXY_OPENAI_BASE",
+]

shotgun/shotgun_web/constants.py

@@ -1,12 +1,7 @@
 """Constants for Shotgun Web API."""
 
-import os
-
-# Shotgun Web API base URL
-# Default to production URL, can be overridden with environment variable
-SHOTGUN_WEB_BASE_URL = os.environ.get(
-    "SHOTGUN_WEB_BASE_URL", "https://api-701197220809.us-east1.run.app"
-)
+# Import from centralized API endpoints module
+from shotgun.api_endpoints import SHOTGUN_WEB_BASE_URL
 
 # API endpoints
 UNIFICATION_TOKEN_CREATE_PATH = "/api/unification/token/create"  # noqa: S105
@@ -15,3 +10,12 @@ UNIFICATION_TOKEN_STATUS_PATH = "/api/unification/token/{token}/status"  # noqa:
 # Polling configuration
 DEFAULT_POLL_INTERVAL_SECONDS = 3
 DEFAULT_TOKEN_TIMEOUT_SECONDS = 1800  # 30 minutes
+
+# Re-export for backward compatibility
+__all__ = [
+    "SHOTGUN_WEB_BASE_URL",
+    "UNIFICATION_TOKEN_CREATE_PATH",
+    "UNIFICATION_TOKEN_STATUS_PATH",
+    "DEFAULT_POLL_INTERVAL_SECONDS",
+    "DEFAULT_TOKEN_TIMEOUT_SECONDS",
+]

shotgun/tui/app.py

@@ -8,7 +8,6 @@ from textual.screen import Screen
 from shotgun.agents.config import ConfigManager, get_config_manager
 from shotgun.logging_config import get_logger
 from shotgun.tui.screens.splash import SplashScreen
-from shotgun.utils.env_utils import is_shotgun_account_enabled
 from shotgun.utils.file_system_utils import get_shotgun_base_path
 from shotgun.utils.update_checker import perform_auto_update_async
 
@@ -61,28 +60,21 @@ class ShotgunApp(App[None]):
 
     def refresh_startup_screen(self) -> None:
         """Push the appropriate screen based on configured providers."""
-        if not self.config_manager.has_any_provider_key():
-            # If Shotgun Account is enabled, show welcome screen with choice
-            # Otherwise, go directly to provider config (BYOK only)
-            if is_shotgun_account_enabled():
-                if isinstance(self.screen, WelcomeScreen):
-                    return
-
-                self.push_screen(
-                    WelcomeScreen(),
-                    callback=lambda _arg: self.refresh_startup_screen(),
-                )
-                return
-            else:
-                if isinstance(self.screen, ProviderConfigScreen):
-                    return
-
-                self.push_screen(
-                    ProviderConfigScreen(),
-                    callback=lambda _arg: self.refresh_startup_screen(),
-                )
+        # Show welcome screen if no providers are configured OR if user hasn't seen it yet
+        config = self.config_manager.load()
+        if (
+            not self.config_manager.has_any_provider_key()
+            or not config.shown_welcome_screen
+        ):
+            if isinstance(self.screen, WelcomeScreen):
                 return
 
+            self.push_screen(
+                WelcomeScreen(),
+                callback=lambda _arg: self.refresh_startup_screen(),
+            )
+            return
+
         if not self.check_local_shotgun_directory_exists():
             if isinstance(self.screen, DirectorySetupScreen):
                 return

shotgun/tui/screens/provider_config.py

@@ -12,23 +12,19 @@ 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
 
 
 def get_configurable_providers() -> list[str]:
-    """Get list of configurable providers based on feature flags.
+    """Get list of configurable providers.
 
     Returns:
         List of provider identifiers that can be configured.
-        Includes shotgun only if SHOTGUN_ACCOUNT_ENABLED is set.
+        Includes all providers: openai, anthropic, google, and shotgun.
     """
-    providers = ["openai", "anthropic", "google"]
-    if is_shotgun_account_enabled():
-        providers.append("shotgun")
-    return providers
+    return ["openai", "anthropic", "google", "shotgun"]
 
 
 class ProviderConfigScreen(Screen[None]):

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/utils/env_utils.py

@@ -1,16 +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
+        True always (Shotgun Account is now live for all users)
+
+    Note:
+        This function is deprecated and always returns True.
+        Shotgun Account is now available to all users by default.
     """
-    return is_truthy(os.environ.get("SHOTGUN_ACCOUNT_ENABLED"))
+    return True
 
 
 def is_truthy(value: str | None) -> bool:

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

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

@@ -1,5 +1,6 @@
 shotgun/__init__.py,sha256=P40K0fnIsb7SKcQrFnXZ4aREjpWchVDhvM1HxI4cyIQ,104
-shotgun/build_constants.py,sha256=RXNxMz46HaB5jucgMVpw8a2yCJqjbhTOh0PddyEVMN8,713
+shotgun/api_endpoints.py,sha256=TvxuJyMrZLy6KZTrR6lrdkG8OBtb3TJ48qaw3pWitO0,526
+shotgun/build_constants.py,sha256=hDFr6eO0lwN0iCqHQ1A5s0D68txR8sYrTJLGa7tSi0o,654
 shotgun/logging_config.py,sha256=UKenihvgH8OA3W0b8ZFcItYaFJVe9MlsMYlcevyW1HY,7440
 shotgun/main.py,sha256=RA3q1xPfqxCu43UmgI2ryZpA-IxPhJb_MJrbLqp9c_g,5140
 shotgun/posthog_telemetry.py,sha256=TOiyBtLg21SttHGWKc4-e-PQgpbq6Uz_4OzlvlxMcZ0,6099
@@ -22,7 +23,7 @@ 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=e1HjGWKN1l9jDmK5MG8cZ6UMeWq6MntVv0NfETIgSO8,17577
+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/history/__init__.py,sha256=XFQj2a6fxDqVg0Q3juvN9RjV_RJbgvFZtQOCOjVJyp4,147
@@ -83,7 +84,7 @@ shotgun/codebase/core/nl_query.py,sha256=kPoSJXBlm5rLhzOofZhqPVMJ_Lj3rV2H6sld6Bw
 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/constants.py,sha256=E8sqL-8GZzl989T3OS7E1hImSZPj2vqmp3lbM6zGiQU,309
+shotgun/llm_proxy/constants.py,sha256=_4piKdyvM7pAIRdAGrzYexwWoDlueUZiEMfwWrOa4T0,381
 shotgun/prompts/__init__.py,sha256=RswUm0HMdfm2m2YKUwUsEdRIwoczdbI7zlucoEvHYRo,132
 shotgun/prompts/loader.py,sha256=jy24-E02pCSmz2651aCT2NgHfRrHAGMYvKrD6gs0Er8,4424
 shotgun/prompts/agents/__init__.py,sha256=YRIJMbzpArojNX1BP5gfxxois334z_GQga8T-xyWMbY,39
@@ -115,10 +116,10 @@ shotgun/sdk/models.py,sha256=X9nOTUHH0cdkQW1NfnMEDu-QgK9oUsEISh1Jtwr5Am4,5496
 shotgun/sdk/services.py,sha256=J4PJFSxCQ6--u7rb3Ta-9eYtlYcxcbnzrMP6ThyCnw4,705
 shotgun/shotgun_web/__init__.py,sha256=IB-TvK3WvLNrdKH0j9MwMGtIjqi81ASFIVwaZa0ifNg,461
 shotgun/shotgun_web/client.py,sha256=n5DDuVfSa6VPZjhSsfSxQlSFOnhgDHyidRnB8Hv9XF4,4134
-shotgun/shotgun_web/constants.py,sha256=b1pwWr9l__3fVex6EUx8Z0fBO3jkzvr9gDdZK9_0jik,553
+shotgun/shotgun_web/constants.py,sha256=eNvtjlu81bAVQaCwZXOVjSpDopUm9pf34XuZEvuMiko,661
 shotgun/shotgun_web/models.py,sha256=Ie9VfqKZM2tIJhIjentU9qLoNaMZvnUJaIu-xg9kQsA,1391
 shotgun/tui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shotgun/tui/app.py,sha256=bWs0GVJzXb6ZdANDi0qw1xtOAuVaCX6Xgb-ziNi5kVg,5753
+shotgun/tui/app.py,sha256=B2tKbXeGhWBIVec1jJHGAuBcP1SMbO_6xol2OaBpw2Y,5374
 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
@@ -131,10 +132,10 @@ shotgun/tui/screens/chat.tcss,sha256=2Yq3E23jxsySYsgZf4G1AYrYVcpX0UDW6kNNI0tDmtM
 shotgun/tui/screens/directory_setup.py,sha256=lIZ1J4A6g5Q2ZBX8epW7BhR96Dmdcg22CyiM5S-I5WU,3237
 shotgun/tui/screens/feedback.py,sha256=VxpW0PVxMp22ZvSfQkTtgixNrpEOlfWtekjqlVfYEjA,5708
 shotgun/tui/screens/model_picker.py,sha256=G-EvalpxgHKk0W3FgHMcxIr817VwZyEgh_ZadSQiRwo,11831
-shotgun/tui/screens/provider_config.py,sha256=s3SA13BJsV_Ge5lXdd4nOtbhCMjBPKqNOGaN20uMRBA,11069
+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
@@ -142,12 +143,12 @@ shotgun/tui/screens/chat_screen/history.py,sha256=Go859iEjw0s5aELKpF42MjLXy7UFQ5
 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=5spVCdeqVKtlWoKocPhz_5j_iRN30neqcGUzUuiWmfc,1365
+shotgun/utils/env_utils.py,sha256=ulM3BRi9ZhS7uC-zorGeDQm4SHvsyFuuU9BtVPqdrHY,1418
 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.2.dev1.dist-info/METADATA,sha256=8_6NnepJIc4kB05vOqw0AoedwoJHuIJBjMRpjmWsJQQ,11226
-shotgun_sh-0.2.2.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.2.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.2.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.2.dev1.dist-info/RECORD,,
+shotgun_sh-0.2.3.dist-info/METADATA,sha256=M_b9GUBwPll4W0CJYd6pa8F6uwdYVu1LwTAWoGyoA8c,11221
+shotgun_sh-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.3.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.3.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.3.dist-info/RECORD,,