shotgun-sh 0.2.17__py3-none-any.whl → 0.3.3.dev1__py3-none-any.whl

shotgun/shotgun_web/supabase_client.py

@@ -0,0 +1,31 @@
+"""Supabase Storage download utilities."""
+
+import httpx
+
+from shotgun.logging_config import get_logger
+
+logger = get_logger(__name__)
+
+
+async def download_file_from_url(download_url: str) -> bytes:
+    """Download a file from a presigned Supabase Storage URL.
+
+    The API returns presigned URLs with embedded tokens that don't require
+    any authentication headers.
+
+    Args:
+        download_url: Presigned Supabase Storage URL
+                     (e.g., "https://...supabase.co/storage/v1/object/sign/...?token=...")
+
+    Returns:
+        File contents as bytes
+
+    Raises:
+        httpx.HTTPStatusError: If download fails
+    """
+    logger.debug("Downloading file from: %s", download_url)
+
+    async with httpx.AsyncClient(timeout=60.0) as client:
+        response = await client.get(download_url)
+        response.raise_for_status()
+        return response.content

shotgun/tui/app.py

@@ -6,12 +6,18 @@ from textual.binding import Binding
 from textual.screen import Screen
 
 from shotgun.agents.agent_manager import AgentManager
-from shotgun.agents.config import ConfigManager, get_config_manager
+from shotgun.agents.config import (
+    ConfigManager,
+    get_config_manager,
+)
 from shotgun.agents.models import AgentType
 from shotgun.logging_config import get_logger
 from shotgun.tui.containers import TUIContainer
 from shotgun.tui.screens.splash import SplashScreen
-from shotgun.utils.file_system_utils import get_shotgun_base_path
+from shotgun.utils.file_system_utils import (
+    ensure_shotgun_directory_exists,
+    get_shotgun_base_path,
+)
 from shotgun.utils.update_checker import (
     detect_installation_method,
     perform_auto_update_async,
@@ -31,10 +37,10 @@ logger = get_logger(__name__)
 class ShotgunApp(App[None]):
     # ChatScreen removed from SCREENS dict since it requires dependency injection
     # and is instantiated manually in refresh_startup_screen()
+    # DirectorySetupScreen also removed since it requires error_message parameter
     SCREENS = {
         "provider_config": ProviderConfigScreen,
         "model_picker": ModelPickerScreen,
-        "directory_setup": DirectorySetupScreen,
         "github_issue": GitHubIssueScreen,
     }
     BINDINGS = [
@@ -48,12 +54,16 @@ class ShotgunApp(App[None]):
         no_update_check: bool = False,
         continue_session: bool = False,
         force_reindex: bool = False,
+        show_pull_hint: bool = False,
+        pull_version_id: str | None = None,
     ) -> None:
         super().__init__()
         self.config_manager: ConfigManager = get_config_manager()
         self.no_update_check = no_update_check
         self.continue_session = continue_session
         self.force_reindex = force_reindex
+        self.show_pull_hint = show_pull_hint
+        self.pull_version_id = pull_version_id
 
         # Initialize dependency injection container
         self.container = TUIContainer()
@@ -71,6 +81,8 @@ class ShotgunApp(App[None]):
             "tui_started",
             {
                 "installation_method": detect_installation_method(),
+                "terminal_width": self.size.width,
+                "terminal_height": self.size.height,
             },
         )
 
@@ -99,7 +111,10 @@ class ShotgunApp(App[None]):
         # Run async config loading in worker
         async def _check_config() -> None:
             # Show welcome screen if no providers are configured OR if user hasn't seen it yet
+            # Note: If config migration fails, ConfigManager will auto-create fresh config
+            # and set migration_failed flag, which WelcomeScreen will display
             config = await self.config_manager.load()
+
             has_any_key = await self.config_manager.has_any_provider_key()
             if not has_any_key or not config.shown_welcome_screen:
                 if isinstance(self.screen, WelcomeScreen):
@@ -111,17 +126,43 @@ class ShotgunApp(App[None]):
                 )
                 return
 
+            # Try to create .shotgun directory if it doesn't exist
             if not self.check_local_shotgun_directory_exists():
-                if isinstance(self.screen, DirectorySetupScreen):
+                try:
+                    path = ensure_shotgun_directory_exists()
+                    # Verify directory was created successfully
+                    if not path.is_dir():
+                        # Show error screen if creation failed
+                        if isinstance(self.screen, DirectorySetupScreen):
+                            return
+                        self.push_screen(
+                            DirectorySetupScreen(
+                                error_message="Unable to create .shotgun directory due to filesystem conflict."
+                            ),
+                            callback=lambda _arg: self.refresh_startup_screen(),
+                        )
+                        return
+                except Exception as exc:
+                    # Show error screen if creation failed with exception
+                    if isinstance(self.screen, DirectorySetupScreen):
+                        return
+                    self.push_screen(
+                        DirectorySetupScreen(error_message=str(exc)),
+                        callback=lambda _arg: self.refresh_startup_screen(),
+                    )
                     return
 
-                self.push_screen(
-                    DirectorySetupScreen(),
-                    callback=lambda _arg: self.refresh_startup_screen(),
-                )
+            if isinstance(self.screen, ChatScreen):
                 return
 
-            if isinstance(self.screen, ChatScreen):
+            # If we have a version to pull, show pull screen first
+            if self.pull_version_id:
+                from .screens.spec_pull import SpecPullScreen
+
+                self.push_screen(
+                    SpecPullScreen(self.pull_version_id),
+                    callback=self._handle_pull_complete,
+                )
                 return
 
             # Create ChatScreen with all dependencies injected from container
@@ -155,6 +196,7 @@ class ShotgunApp(App[None]):
                 deps=agent_deps,
                 continue_session=self.continue_session,
                 force_reindex=self.force_reindex,
+                show_pull_hint=self.show_pull_hint,
             )
 
             # Update the ProcessingStateManager and WidgetCoordinator with the actual ChatScreen instance
@@ -170,6 +212,22 @@ class ShotgunApp(App[None]):
         shotgun_dir = get_shotgun_base_path()
         return shotgun_dir.exists() and shotgun_dir.is_dir()
 
+    def _handle_pull_complete(self, success: bool | None) -> None:
+        """Handle completion of spec pull screen.
+
+        Args:
+            success: Whether the pull was successful, or None if dismissed.
+        """
+        # Clear version_id so we don't pull again on next refresh
+        self.pull_version_id = None
+
+        if success:
+            # Enable hint for ChatScreen
+            self.show_pull_hint = True
+
+        # Continue to ChatScreen
+        self.refresh_startup_screen()
+
     async def action_quit(self) -> None:
         """Quit the application."""
         # Shut down PostHog client to prevent threading errors
@@ -196,6 +254,8 @@ def run(
     no_update_check: bool = False,
     continue_session: bool = False,
     force_reindex: bool = False,
+    show_pull_hint: bool = False,
+    pull_version_id: str | None = None,
 ) -> None:
     """Run the TUI application.
 
@@ -203,6 +263,8 @@ def run(
         no_update_check: If True, disable automatic update checks.
         continue_session: If True, continue from previous conversation.
         force_reindex: If True, force re-indexing of codebase (ignores existing index).
+        show_pull_hint: If True, show hint about recently pulled spec.
+        pull_version_id: If provided, pull this spec version before showing ChatScreen.
     """
     # Clean up any corrupted databases BEFORE starting the TUI
     # This prevents crashes from corrupted databases during initialization
@@ -228,6 +290,8 @@ def run(
         no_update_check=no_update_check,
         continue_session=continue_session,
         force_reindex=force_reindex,
+        show_pull_hint=show_pull_hint,
+        pull_version_id=pull_version_id,
     )
     app.run(inline_no_clear=True)
 

shotgun/tui/containers.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from dependency_injector import containers, providers
 from pydantic_ai import RunContext
 
-from shotgun.agents.conversation_manager import ConversationManager
+from shotgun.agents.conversation import ConversationManager
 from shotgun.agents.models import AgentDeps
 from shotgun.sdk.codebase import CodebaseSDK
 from shotgun.tui.commands import CommandHandler

shotgun/tui/layout.py

@@ -0,0 +1,5 @@
+"""Layout utilities for responsive terminal UI."""
+
+# Height thresholds for responsive layouts
+TINY_HEIGHT_THRESHOLD = 25  # Below this: minimal UI, hide most content
+COMPACT_HEIGHT_THRESHOLD = 35  # Below this: reduced padding, hide verbose text