shotgun-sh 0.2.23.dev1__py3-none-any.whl → 0.2.29.dev2__py3-none-any.whl

shotgun/tui/screens/spec_pull.py

@@ -0,0 +1,286 @@
+"""Screen showing download progress for pulling specs."""
+
+from textual import on, work
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal
+from textual.events import Resize
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label, ProgressBar, Static
+from textual.worker import Worker, get_current_worker
+
+from shotgun.cli.spec.pull_service import (
+    CancelledError,
+    PullProgress,
+    SpecPullService,
+)
+from shotgun.logging_config import get_logger
+from shotgun.shotgun_web.exceptions import (
+    ForbiddenError,
+    NotFoundError,
+    UnauthorizedError,
+)
+from shotgun.tui.layout import COMPACT_HEIGHT_THRESHOLD
+from shotgun.utils.file_system_utils import get_shotgun_base_path
+
+logger = get_logger(__name__)
+
+
+class SpecPullScreen(ModalScreen[bool]):
+    """Screen to pull a spec version with progress display.
+
+    Returns True if pull was successful, False otherwise.
+    """
+
+    DEFAULT_CSS = """
+        SpecPullScreen {
+            align: center middle;
+            background: rgba(0, 0, 0, 0.0);
+        }
+
+        SpecPullScreen > #dialog-container {
+            width: 80%;
+            max-width: 90;
+            height: auto;
+            border: wide $primary;
+            padding: 1 2;
+            layout: vertical;
+            background: $surface;
+        }
+
+        #dialog-title {
+            text-style: bold;
+            color: $text-accent;
+            padding-bottom: 1;
+            text-align: center;
+        }
+
+        #phase-label {
+            padding: 0;
+        }
+
+        #progress-bar {
+            width: 100%;
+            padding: 0;
+        }
+
+        #file-label {
+            color: $text-muted;
+        }
+
+        #error-label {
+            color: $error;
+        }
+
+        #success-label {
+            color: $success;
+            text-style: bold;
+        }
+
+        #dialog-buttons {
+            layout: horizontal;
+            align-horizontal: center;
+            height: auto;
+        }
+
+        #dialog-buttons Button {
+            margin: 0 1;
+        }
+
+        /* Hide elements initially */
+        #success-label {
+            display: none;
+        }
+
+        #error-label {
+            display: none;
+        }
+
+        /* Compact styles for short terminals */
+        SpecPullScreen.compact #dialog-container {
+            padding: 0 2;
+            max-height: 98%;
+        }
+
+        SpecPullScreen.compact #dialog-title {
+            padding-bottom: 0;
+        }
+    """
+
+    BINDINGS = [
+        ("escape", "cancel", "Cancel"),
+    ]
+
+    def __init__(self, version_id: str) -> None:
+        """Initialize the screen.
+
+        Args:
+            version_id: Version UUID to pull.
+        """
+        super().__init__()
+        self.version_id = version_id
+        self._success = False
+        self._download_worker: Worker[None] | None = None
+        self._cancelled = False
+
+    def compose(self) -> ComposeResult:
+        """Compose the screen widgets."""
+        with Container(id="dialog-container"):
+            yield Label("Pulling spec from cloud", id="dialog-title")
+
+            # Progress section
+            yield Static("Fetching version info...", id="phase-label")
+            yield ProgressBar(total=100, id="progress-bar")
+            yield Static("", id="file-label")
+
+            # Error section (hidden by default)
+            yield Static("", id="error-label")
+
+            # Success section (hidden by default)
+            yield Static("Spec pulled successfully!", id="success-label")
+
+            # Buttons
+            with Horizontal(id="dialog-buttons"):
+                yield Button("Cancel", id="cancel-btn")
+                yield Button("Continue", variant="primary", id="done-btn")
+
+    def on_mount(self) -> None:
+        """Start the download when screen is mounted."""
+        # Hide done button initially
+        self.query_one("#done-btn", Button).display = False
+
+        # Apply compact layout if starting in a short terminal
+        self._apply_compact_layout(self.app.size.height < COMPACT_HEIGHT_THRESHOLD)
+
+        # Start the download
+        self._start_download()
+
+    @on(Resize)
+    def handle_resize(self, event: Resize) -> None:
+        """Adjust layout based on terminal height."""
+        self._apply_compact_layout(event.size.height < COMPACT_HEIGHT_THRESHOLD)
+
+    def _apply_compact_layout(self, compact: bool) -> None:
+        """Apply or remove compact layout class for short terminals."""
+        if compact:
+            self.add_class("compact")
+        else:
+            self.remove_class("compact")
+
+    @work(exclusive=True)
+    async def _start_download(self) -> None:
+        """Run the download pipeline."""
+        worker = get_current_worker()
+        self._download_worker = worker
+
+        shotgun_dir = get_shotgun_base_path()
+        service = SpecPullService()
+
+        def on_progress(p: PullProgress) -> None:
+            pct = 0.0
+            if p.total_files and p.file_index is not None:
+                pct = ((p.file_index + 1) / p.total_files) * 100
+            self._update_phase(p.phase, progress=pct, current_file=p.current_file)
+
+        try:
+            result = await service.pull_version(
+                version_id=self.version_id,
+                shotgun_dir=shotgun_dir,
+                on_progress=on_progress,
+                is_cancelled=lambda: worker.is_cancelled,
+            )
+
+            if result.success:
+                self._update_title(f"Pulled: {result.spec_name}")
+                self._success = True
+                self._show_success()
+            else:
+                self._show_error(result.error or "Unknown error")
+
+        except CancelledError:
+            self._cancelled = True
+            self._show_cancelled()
+        except UnauthorizedError:
+            self._show_error("Not authenticated. Please try again.")
+        except NotFoundError:
+            self._show_error(f"Version not found: {self.version_id}")
+        except ForbiddenError:
+            self._show_error("You don't have access to this spec.")
+        except Exception as e:
+            logger.exception(f"Download failed: {type(e).__name__}: {e}")
+            error_msg = str(e) if str(e) else type(e).__name__
+            self._show_error(error_msg)
+
+    def _update_title(self, title: str) -> None:
+        """Update the dialog title."""
+        self.query_one("#dialog-title", Label).update(title)
+
+    def _update_phase(
+        self,
+        phase_text: str,
+        progress: float = 0,
+        current_file: str | None = None,
+    ) -> None:
+        """Update the progress UI."""
+        self.query_one("#phase-label", Static).update(phase_text)
+        self.query_one("#progress-bar", ProgressBar).update(progress=progress)
+
+        file_label = self.query_one("#file-label", Static)
+        if current_file:
+            file_label.update(f"Current: {current_file}")
+        else:
+            file_label.update("")
+
+    def _show_success(self) -> None:
+        """Show success state."""
+        self.query_one("#phase-label", Static).update("Download complete!")
+        self.query_one("#progress-bar", ProgressBar).update(progress=100)
+        self.query_one("#success-label", Static).display = True
+        self.query_one("#cancel-btn", Button).display = False
+        self.query_one("#done-btn", Button).display = True
+
+    def _show_error(self, error: str) -> None:
+        """Show error state."""
+        error_label = self.query_one("#error-label", Static)
+        error_label.update(f"Error: {error}")
+        error_label.display = True
+        self.query_one("#cancel-btn", Button).display = False
+        self.query_one("#done-btn", Button).display = True
+        self.query_one("#done-btn", Button).label = "Close"
+
+    def _show_cancelled(self) -> None:
+        """Show cancelled state."""
+        self.query_one("#phase-label", Static).update("Download cancelled")
+        self.query_one("#cancel-btn", Button).display = False
+        self.query_one("#done-btn", Button).display = True
+        self.query_one("#done-btn", Button).label = "Close"
+
+    @on(Button.Pressed, "#cancel-btn")
+    def _on_cancel(self, event: Button.Pressed) -> None:
+        """Handle cancel button."""
+        event.stop()
+        self._cancel_download()
+
+    @on(Button.Pressed, "#done-btn")
+    def _on_done(self, event: Button.Pressed) -> None:
+        """Handle done button."""
+        event.stop()
+        self.dismiss(self._success)
+
+    def action_cancel(self) -> None:
+        """Handle escape key."""
+        if (
+            self._success
+            or self._cancelled
+            or self.query_one("#error-label", Static).display
+        ):
+            # Already finished, just dismiss
+            self.dismiss(self._success)
+        else:
+            # Download in progress, cancel it
+            self._cancel_download()
+
+    def _cancel_download(self) -> None:
+        """Cancel the download."""
+        if self._download_worker and not self._download_worker.is_cancelled:
+            self._cancelled = True
+            self._download_worker.cancel()

shotgun/tui/screens/welcome.py

@@ -2,14 +2,18 @@
 
 from __future__ import annotations
 
+import webbrowser
 from typing import TYPE_CHECKING, cast
 
 from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal, Vertical
+from textual.events import Resize
 from textual.screen import Screen
 from textual.widgets import Button, Markdown, Static
 
+from shotgun.tui.layout import TINY_HEIGHT_THRESHOLD
+
 if TYPE_CHECKING:
     from ..app import ShotgunApp
 
@@ -100,6 +104,54 @@ class WelcomeScreen(Screen[None]):
             color: $warning;
             padding: 0 0 1 0;
         }
+
+        /* Tiny screen fallback */
+        #tiny-welcome-container {
+            display: none;
+            width: 100%;
+            height: auto;
+            padding: 0;
+            align: center middle;
+        }
+
+        #tiny-welcome-message {
+            text-align: center;
+            padding: 0;
+        }
+
+        #tiny-welcome-link {
+            text-align: center;
+            padding: 0;
+            color: $accent;
+        }
+
+        #tiny-welcome-buttons {
+            width: auto;
+            height: auto;
+            padding: 0;
+            align: center middle;
+        }
+
+        #tiny-welcome-buttons Button {
+            margin: 0 1;
+        }
+
+        /* Tiny mode - hide full welcome, show minimal */
+        WelcomeScreen.tiny #titlebox {
+            display: none;
+        }
+
+        WelcomeScreen.tiny #options-container {
+            display: none;
+        }
+
+        WelcomeScreen.tiny #migration-warning {
+            display: none;
+        }
+
+        WelcomeScreen.tiny #tiny-welcome-container {
+            display: block;
+        }
     """
 
     BINDINGS = [
@@ -107,6 +159,24 @@ class WelcomeScreen(Screen[None]):
     ]
 
     def compose(self) -> ComposeResult:
+        # Tiny screen fallback
+        with Container(id="tiny-welcome-container"):
+            yield Static(
+                "Welcome to Shotgun",
+                id="tiny-welcome-message",
+            )
+            yield Static(
+                "[@click=screen.open_usage_guide]View setup instructions[/]",
+                id="tiny-welcome-link",
+                markup=True,
+            )
+            with Horizontal(id="tiny-welcome-buttons"):
+                yield Button(
+                    "Shotgun Account", id="tiny-shotgun-button", variant="primary"
+                )
+                yield Button("BYOK", id="tiny-byok-button", variant="success")
+
+        # Full welcome screen
         with Vertical(id="titlebox"):
             yield Static("Welcome to Shotgun", id="welcome-title")
             yield Static(
@@ -168,10 +238,29 @@ class WelcomeScreen(Screen[None]):
 
     def on_mount(self) -> None:
         """Focus the first button on mount."""
+        self._apply_layout_for_height(self.app.size.height)
         self.query_one("#shotgun-button", Button).focus()
         # Update BYOK button text asynchronously
         self.run_worker(self._update_byok_button_text(), exclusive=False)
 
+    @on(Resize)
+    def handle_resize(self, event: Resize) -> None:
+        """Adjust layout based on terminal height."""
+        self._apply_layout_for_height(event.size.height)
+
+    def _apply_layout_for_height(self, height: int) -> None:
+        """Apply appropriate layout based on terminal height."""
+        if height < TINY_HEIGHT_THRESHOLD:
+            self.add_class("tiny")
+        else:
+            self.remove_class("tiny")
+
+    def action_open_usage_guide(self) -> None:
+        """Open the usage guide in browser."""
+        webbrowser.open(
+            "https://github.com/shotgun-sh/shotgun?tab=readme-ov-file#-usage"
+        )
+
     async def _update_byok_button_text(self) -> None:
         """Update BYOK button text based on whether user has existing providers."""
         byok_button = self.query_one("#byok-button", Button)
@@ -180,11 +269,13 @@ class WelcomeScreen(Screen[None]):
             byok_button.label = "I'll stick with my BYOK setup"
 
     @on(Button.Pressed, "#shotgun-button")
+    @on(Button.Pressed, "#tiny-shotgun-button")
     def _on_shotgun_pressed(self) -> None:
         """Handle Shotgun Account button press."""
         self.run_worker(self._start_shotgun_auth(), exclusive=True)
 
     @on(Button.Pressed, "#byok-button")
+    @on(Button.Pressed, "#tiny-byok-button")
     def _on_byok_pressed(self) -> None:
         """Handle BYOK button press."""
         self.run_worker(self._start_byok_config(), exclusive=True)

shotgun/tui/services/conversation_service.py

@@ -10,8 +10,11 @@ from typing import TYPE_CHECKING
 
 import aiofiles.os
 
-from shotgun.agents.conversation_history import ConversationHistory, ConversationState
-from shotgun.agents.conversation_manager import ConversationManager
+from shotgun.agents.conversation import (
+    ConversationHistory,
+    ConversationManager,
+    ConversationState,
+)
 from shotgun.agents.models import AgentType
 
 if TYPE_CHECKING:

shotgun/tui/widgets/widget_coordinator.py

@@ -24,8 +24,8 @@ from shotgun.tui.screens.chat_screen.history.chat_history import ChatHistory
 
 if TYPE_CHECKING:
     from shotgun.agents.context_analyzer.models import ContextAnalysis
-    from shotgun.agents.conversation_history import HintMessage
     from shotgun.tui.screens.chat import ChatScreen
+    from shotgun.tui.screens.chat_screen.hint_message import HintMessage
 
 logger = logging.getLogger(__name__)
 

{shotgun_sh-0.2.23.dev1.dist-info → shotgun_sh-0.2.29.dev2.dist-info}/METADATA

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