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

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
 
@@ -85,6 +89,69 @@ class WelcomeScreen(Screen[None]):
             margin: 1 0 0 0;
             width: 100%;
         }
+
+        #migration-warning {
+            width: 80%;
+            height: auto;
+            padding: 2;
+            margin: 1 0;
+            border: solid $warning;
+            background: $warning 20%;
+        }
+
+        #migration-warning-title {
+            text-style: bold;
+            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 = [
@@ -92,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(
@@ -99,6 +184,23 @@ class WelcomeScreen(Screen[None]):
                 id="welcome-subtitle",
             )
 
+        # Show migration warning if migration failed
+        app = cast("ShotgunApp", self.app)
+        # Note: This is a synchronous call in compose, but config should already be loaded
+        if hasattr(app, "config_manager") and app.config_manager._config:
+            config = app.config_manager._config
+            if config.migration_failed:
+                with Vertical(id="migration-warning"):
+                    yield Static(
+                        "⚠️  Configuration Migration Failed",
+                        id="migration-warning-title",
+                    )
+                    backup_msg = "Your previous configuration couldn't be migrated automatically."
+                    if config.migration_backup_path:
+                        backup_msg += f"\n\nYour old configuration (including API keys) has been backed up to:\n{config.migration_backup_path}"
+                    backup_msg += "\n\nYou'll need to reconfigure Shotgun by choosing an option below."
+                    yield Markdown(backup_msg)
+
         with Container(id="options-container"):
             with Horizontal(id="options"):
                 # Left box - Shotgun Account
@@ -136,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)
@@ -148,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/utils/mode_progress.py

@@ -113,93 +113,24 @@ class ModeProgressChecker:
 
 
 class PlaceholderHints:
-    """Manages dynamic placeholder hints for each mode based on progress."""
+    """Manages dynamic placeholder hints for the Router agent."""
 
-    # Placeholder variations for each mode and state
+    # Placeholder variations for Router mode
     HINTS = {
-        # Research mode
-        AgentType.RESEARCH: {
+        AgentType.ROUTER: {
             False: [
-                "Research a product or idea (SHIFT+TAB to cycle modes)",
-                "What would you like to explore? Start your research journey here (SHIFT+TAB to switch modes)",
-                "Dive into discovery mode - research anything that sparks curiosity (SHIFT+TAB for mode menu)",
-                "Ready to investigate? Feed me your burning questions (SHIFT+TAB to explore other modes)",
-                " 🔍 The research rabbit hole awaits! What shall we uncover? (SHIFT+TAB for mode carousel)",
+                "What would you like to work on? (SHIFT+TAB to toggle Planning/Drafting)",
+                "Ask me to research, plan, or implement anything (SHIFT+TAB toggles mode)",
+                "Describe your goal and I'll help break it down (SHIFT+TAB for mode toggle)",
+                "Ready to help with research, specs, plans, or tasks (SHIFT+TAB toggles mode)",
+                "Tell me what you need - I'll coordinate the work (SHIFT+TAB for Planning/Drafting)",
             ],
             True: [
-                "Research complete! SHIFT+TAB to move to Specify mode",
-                "Great research! Time to specify (SHIFT+TAB to Specify mode)",
-                "Research done! Ready to create specifications (SHIFT+TAB to Specify)",
-                "Findings gathered! Move to specifications (SHIFT+TAB for Specify mode)",
-                " 🎯 Research complete! Advance to Specify mode (SHIFT+TAB)",
-            ],
-        },
-        # Specify mode
-        AgentType.SPECIFY: {
-            False: [
-                "Create detailed specifications and requirements (SHIFT+TAB to switch modes)",
-                "Define your project specifications here (SHIFT+TAB to navigate modes)",
-                "Time to get specific - write comprehensive specs (SHIFT+TAB for mode options)",
-                "Specification station: Document requirements and designs (SHIFT+TAB to change modes)",
-                " 📋 Spec-tacular time! Let's architect your ideas (SHIFT+TAB for mode magic)",
-            ],
-            True: [
-                "Specifications complete! SHIFT+TAB to create a Plan",
-                "Specs ready! Time to plan (SHIFT+TAB to Plan mode)",
-                "Requirements defined! Move to planning (SHIFT+TAB to Plan)",
-                "Specifications done! Create your roadmap (SHIFT+TAB for Plan mode)",
-                " 🚀 Specs complete! Advance to Plan mode (SHIFT+TAB)",
-            ],
-        },
-        # Tasks mode
-        AgentType.TASKS: {
-            False: [
-                "Break down your project into actionable tasks (SHIFT+TAB for modes)",
-                "Task creation time! Define your implementation steps (SHIFT+TAB to switch)",
-                "Ready to get tactical? Create your task list (SHIFT+TAB for mode options)",
-                "Task command center: Organize your work items (SHIFT+TAB to navigate)",
-                " ✅ Task mode activated! Break it down into bite-sized pieces (SHIFT+TAB)",
-            ],
-            True: [
-                "Tasks defined! Ready to export or cycle back (SHIFT+TAB)",
-                "Task list complete! Export your work (SHIFT+TAB to Export)",
-                "All tasks created! Time to export (SHIFT+TAB for Export mode)",
-                "Implementation plan ready! Export everything (SHIFT+TAB to Export)",
-                " 🎊 Tasks complete! Export your masterpiece (SHIFT+TAB)",
-            ],
-        },
-        # Export mode
-        AgentType.EXPORT: {
-            False: [
-                "Export your complete project documentation (SHIFT+TAB for modes)",
-                "Ready to package everything? Export time! (SHIFT+TAB to switch)",
-                "Export station: Generate deliverables (SHIFT+TAB for mode menu)",
-                "Time to share your work! Export documents (SHIFT+TAB to navigate)",
-                " 📦 Export mode! Package and share your creation (SHIFT+TAB)",
-            ],
-            True: [
-                "Exported! Start new research or continue refining (SHIFT+TAB)",
-                "Export complete! New cycle begins (SHIFT+TAB to Research)",
-                "All exported! Ready for another round (SHIFT+TAB for Research)",
-                "Documents exported! Start fresh (SHIFT+TAB to Research mode)",
-                " 🎉 Export complete! Begin a new adventure (SHIFT+TAB)",
-            ],
-        },
-        # Plan mode
-        AgentType.PLAN: {
-            False: [
-                "Create a strategic plan for your project (SHIFT+TAB for modes)",
-                "Planning phase: Map out your roadmap (SHIFT+TAB to switch)",
-                "Time to strategize! Create your project plan (SHIFT+TAB for options)",
-                "Plan your approach and milestones (SHIFT+TAB to navigate)",
-                " 🗺️ Plan mode! Chart your course to success (SHIFT+TAB)",
-            ],
-            True: [
-                "Plan complete! Move to Tasks mode (SHIFT+TAB)",
-                "Strategy ready! Time for tasks (SHIFT+TAB to Tasks mode)",
-                "Roadmap done! Create task list (SHIFT+TAB for Tasks)",
-                "Planning complete! Break into tasks (SHIFT+TAB to Tasks)",
-                " ⚡ Plan ready! Advance to Tasks mode (SHIFT+TAB)",
+                "Continue working or start something new (SHIFT+TAB toggles mode)",
+                "What's next? (SHIFT+TAB to toggle Planning/Drafting)",
+                "Ready for the next task (SHIFT+TAB toggles Planning/Drafting)",
+                "Let's keep going! (SHIFT+TAB to toggle mode)",
+                "What else can I help with? (SHIFT+TAB for mode toggle)",
             ],
         },
     }
@@ -224,19 +155,22 @@ class PlaceholderHints:
         Returns:
             A contextual hint string for the placeholder.
         """
+        # Always use Router hints since Router is the only user-facing agent
+        mode_key = AgentType.ROUTER
+
         # Default hint if mode not configured
-        if current_mode not in self.HINTS:
-            return f"Enter your {current_mode.value} mode prompt (SHIFT+TAB to switch modes)"
+        if mode_key not in self.HINTS:
+            return "Enter your prompt (SHIFT+TAB to toggle Planning/Drafting mode)"
 
         # For placeholder text, we default to "no content" state (initial hints)
         # This avoids async file system checks in the UI rendering path
         has_content = False
 
         # Get hint variations for this mode and state
-        hints_list = self.HINTS[current_mode][has_content]
+        hints_list = self.HINTS[mode_key][has_content]
 
         # Cache key for this mode and state
-        cache_key = (current_mode, has_content)
+        cache_key = (mode_key, has_content)
 
         # Force refresh or first time
         if force_refresh or cache_key not in self._cached_hints:

shotgun/tui/widgets/__init__.py

@@ -1,5 +1,6 @@
 """Widget utilities and coordinators for TUI."""
 
+from shotgun.tui.widgets.plan_panel import PlanPanelWidget
 from shotgun.tui.widgets.widget_coordinator import WidgetCoordinator
 
-__all__ = ["WidgetCoordinator"]
+__all__ = ["PlanPanelWidget", "WidgetCoordinator"]

shotgun/tui/widgets/approval_widget.py

@@ -0,0 +1,152 @@
+"""Plan approval widget for Planning mode.
+
+This widget displays when a multi-step plan is created in Planning mode,
+allowing the user to approve or reject the plan before execution begins.
+"""
+
+from textual import events, on
+from textual.app import ComposeResult
+from textual.containers import Horizontal, VerticalScroll
+from textual.css.query import NoMatches
+from textual.widget import Widget
+from textual.widgets import Button, Static
+
+from shotgun.agents.router.models import ExecutionPlan
+from shotgun.tui.screens.chat_screen.messages import (
+    PlanApproved,
+    PlanRejected,
+)
+
+
+class PlanApprovalWidget(Widget):
+    """Widget for plan approval in Planning mode.
+
+    Displays the execution plan summary with goal and steps,
+    and provides action buttons for the user to approve or reject.
+
+    Attributes:
+        plan: The execution plan that needs user approval.
+    """
+
+    DEFAULT_CSS = """
+        PlanApprovalWidget {
+            background: $secondary-background-darken-1;
+            height: auto;
+            max-height: 20;
+            margin: 0 1;
+            padding: 1;
+        }
+
+        PlanApprovalWidget .approval-header {
+            height: auto;
+        }
+
+        PlanApprovalWidget .plan-content {
+            height: auto;
+            max-height: 12;
+            margin: 1 0;
+        }
+
+        PlanApprovalWidget .plan-goal {
+            color: $text;
+            margin-bottom: 1;
+        }
+
+        PlanApprovalWidget .plan-steps-label {
+            color: $text-muted;
+        }
+
+        PlanApprovalWidget .step-item {
+            color: $text;
+            margin-left: 2;
+        }
+
+        PlanApprovalWidget .approval-buttons {
+            height: auto;
+            width: 100%;
+            dock: bottom;
+        }
+
+        PlanApprovalWidget Button {
+            margin-right: 1;
+            min-width: 18;
+        }
+
+        PlanApprovalWidget #btn-approve {
+            background: $success;
+        }
+
+        PlanApprovalWidget #btn-reject {
+            background: $error;
+        }
+    """
+
+    def __init__(self, plan: ExecutionPlan) -> None:
+        """Initialize the approval widget.
+
+        Args:
+            plan: The execution plan that needs user approval.
+        """
+        super().__init__()
+        self.plan = plan
+
+    def compose(self) -> ComposeResult:
+        """Compose the approval widget layout."""
+        # Header with step count
+        yield Static(
+            f"[bold]📋 Plan created with {len(self.plan.steps)} steps[/]",
+            classes="approval-header",
+        )
+
+        # Scrollable content area for goal and steps
+        with VerticalScroll(classes="plan-content"):
+            # Goal
+            yield Static(
+                f"[dim]Goal:[/] {self.plan.goal}",
+                classes="plan-goal",
+            )
+
+            # Steps list
+            yield Static("[dim]Steps:[/]", classes="plan-steps-label")
+            for i, step in enumerate(self.plan.steps, 1):
+                yield Static(
+                    f"{i}. {step.title}",
+                    classes="step-item",
+                )
+
+        # Action buttons (always visible at bottom)
+        with Horizontal(classes="approval-buttons"):
+            yield Button("✓ Go Ahead", id="btn-approve")
+            yield Button("✗ No, Let Me Clarify", id="btn-reject")
+
+    def on_mount(self) -> None:
+        """Auto-focus the Go Ahead button on mount."""
+        try:
+            approve_btn = self.query_one("#btn-approve", Button)
+            approve_btn.focus()
+        except NoMatches:
+            pass
+
+    @on(Button.Pressed, "#btn-approve")
+    def handle_approve(self) -> None:
+        """Handle Go Ahead button press."""
+        self.post_message(PlanApproved())
+
+    @on(Button.Pressed, "#btn-reject")
+    def handle_reject(self) -> None:
+        """Handle No, Let Me Clarify button press."""
+        self.post_message(PlanRejected())
+
+    def on_key(self, event: events.Key) -> None:
+        """Handle keyboard shortcuts for approval actions.
+
+        Shortcuts:
+            Enter/Y: Approve plan (Go Ahead)
+            Escape/N: Reject plan (No, Let Me Clarify)
+        """
+        if event.key in ("enter", "y", "Y"):
+            self.post_message(PlanApproved())
+            event.stop()
+        elif event.key in ("escape", "n", "N"):
+            self.post_message(PlanRejected())
+            event.stop()