shotgun-sh 0.2.1.dev4__py3-none-any.whl → 0.2.1.dev5__py3-none-any.whl

shotgun/tui/screens/provider_config.py

@@ -85,6 +85,7 @@ class ProviderConfigScreen(Screen[None]):
 
     BINDINGS = [
         ("escape", "done", "Back"),
+        ("ctrl+c", "app.quit", "Quit"),
     ]
 
     selected_provider: reactive[str] = reactive("openai")
@@ -108,15 +109,20 @@ class ProviderConfigScreen(Screen[None]):
         )
         with Horizontal(id="provider-actions"):
             yield Button("Save key \\[ENTER]", variant="primary", id="save")
+            yield Button("Authenticate", variant="success", id="authenticate")
             yield Button("Clear key", id="clear", variant="warning")
             yield Button("Done \\[ESC]", id="done")
 
     def on_mount(self) -> None:
         self.refresh_provider_status()
+        self._update_done_button_visibility()
         list_view = self.query_one(ListView)
         if list_view.children:
             list_view.index = 0
         self.selected_provider = "openai"
+
+        # Hide authenticate button by default (shown only for shotgun)
+        self.query_one("#authenticate", Button).display = False
         self.set_focus(self.query_one("#api-key", Input))
 
     def on_screenresume(self) -> None:
@@ -125,6 +131,7 @@ class ProviderConfigScreen(Screen[None]):
         This ensures the UI reflects any provider changes made elsewhere.
         """
         self.refresh_provider_status()
+        self._update_done_button_visibility()
 
     def action_done(self) -> None:
         self.dismiss()
@@ -146,6 +153,10 @@ class ProviderConfigScreen(Screen[None]):
     def _on_save_pressed(self) -> None:
         self._save_api_key()
 
+    @on(Button.Pressed, "#authenticate")
+    def _on_authenticate_pressed(self) -> None:
+        self.run_worker(self._start_shotgun_auth(), exclusive=True)
+
     @on(Button.Pressed, "#clear")
     def _on_clear_pressed(self) -> None:
         self._clear_api_key()
@@ -162,9 +173,31 @@ class ProviderConfigScreen(Screen[None]):
     def watch_selected_provider(self, provider: ProviderType) -> None:
         if not self.is_mounted:
             return
+
+        # Show/hide UI elements based on provider type
+        is_shotgun = provider == "shotgun"
+
         input_widget = self.query_one("#api-key", Input)
-        input_widget.placeholder = self._input_placeholder(provider)
-        input_widget.value = ""
+        save_button = self.query_one("#save", Button)
+        auth_button = self.query_one("#authenticate", Button)
+
+        if is_shotgun:
+            # Hide API key input and save button
+            input_widget.display = False
+            save_button.display = False
+
+            # Only show Authenticate button if shotgun is NOT already configured
+            if self._has_provider_key("shotgun"):
+                auth_button.display = False
+            else:
+                auth_button.display = True
+        else:
+            # Show API key input and save button, hide authenticate button
+            input_widget.display = True
+            save_button.display = True
+            auth_button.display = False
+            input_widget.placeholder = self._input_placeholder(provider)
+            input_widget.value = ""
 
     @property
     def config_manager(self) -> ConfigManager:
@@ -177,6 +210,12 @@ class ProviderConfigScreen(Screen[None]):
             label = self.query_one(f"#label-{provider_id}", Label)
             label.update(self._provider_label(provider_id))
 
+    def _update_done_button_visibility(self) -> None:
+        """Show/hide Done button based on whether any provider keys are configured."""
+        done_button = self.query_one("#done", Button)
+        has_keys = self.config_manager.has_any_provider_key()
+        done_button.display = has_keys
+
     def _build_provider_items(self) -> list[ListItem]:
         items: list[ListItem] = []
         for provider_id in get_configurable_providers():
@@ -242,6 +281,7 @@ class ProviderConfigScreen(Screen[None]):
 
         input_widget.value = ""
         self.refresh_provider_status()
+        self._update_done_button_visibility()
         self.notify(
             f"Saved API key for {self._provider_display_name(self.selected_provider)}."
         )
@@ -254,7 +294,26 @@ class ProviderConfigScreen(Screen[None]):
             return
 
         self.refresh_provider_status()
+        self._update_done_button_visibility()
         self.query_one("#api-key", Input).value = ""
+
+        # If we just cleared shotgun, show the Authenticate button
+        if self.selected_provider == "shotgun":
+            auth_button = self.query_one("#authenticate", Button)
+            auth_button.display = True
+
         self.notify(
             f"Cleared API key for {self._provider_display_name(self.selected_provider)}."
         )
+
+    async def _start_shotgun_auth(self) -> None:
+        """Launch Shotgun Account authentication flow."""
+        from .shotgun_auth import ShotgunAuthScreen
+
+        # Push the auth screen and wait for result
+        result = await self.app.push_screen_wait(ShotgunAuthScreen())
+
+        # Refresh provider status after auth completes
+        if result:
+            self.refresh_provider_status()
+            # Notify handled by auth screen

shotgun/tui/screens/shotgun_auth.py

@@ -0,0 +1,295 @@
+"""Shotgun Account authentication screen."""
+
+import asyncio
+import webbrowser
+from typing import TYPE_CHECKING, cast
+
+import httpx
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Vertical
+from textual.screen import Screen
+from textual.widgets import Button, Label, Markdown, Static
+from textual.worker import Worker, WorkerState
+
+from shotgun.agents.config import ConfigManager
+from shotgun.logging_config import get_logger
+from shotgun.shotgun_web import (
+    ShotgunWebClient,
+    TokenStatus,
+)
+from shotgun.shotgun_web.constants import DEFAULT_POLL_INTERVAL_SECONDS
+
+if TYPE_CHECKING:
+    from ..app import ShotgunApp
+
+logger = get_logger(__name__)
+
+
+class ShotgunAuthScreen(Screen[bool]):
+    """Screen for Shotgun Account authentication flow.
+
+    Returns True if authentication was successful, False otherwise.
+    """
+
+    CSS = """
+        ShotgunAuth {
+            layout: vertical;
+        }
+
+        #titlebox {
+            height: auto;
+            margin: 2 0;
+            padding: 1;
+            border: hkey $border;
+            content-align: center middle;
+
+            & > * {
+                text-align: center;
+            }
+        }
+
+        #auth-title {
+            padding: 1 0;
+            text-style: bold;
+            color: $text-accent;
+        }
+
+        #content {
+            padding: 2;
+            height: auto;
+        }
+
+        #status {
+            padding: 1 0;
+            text-align: center;
+        }
+
+        #auth-url {
+            padding: 1;
+            border: solid $primary;
+            background: $surface;
+            text-align: center;
+        }
+
+        #actions {
+            padding: 1;
+            align: center middle;
+        }
+    """
+
+    BINDINGS = [
+        ("escape", "cancel", "Cancel"),
+    ]
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.token: str | None = None
+        self.auth_url: str | None = None
+        self.poll_worker: Worker[None] | None = None
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="titlebox"):
+            yield Static("Shotgun Account Setup", id="auth-title")
+            yield Static(
+                "Authenticate with your Shotgun Account to get started",
+                id="auth-subtitle",
+            )
+
+        with Vertical(id="content"):
+            yield Label("Initializing...", id="status")
+            yield Markdown("", id="auth-url")
+            yield Markdown(
+                "**Instructions:**\n"
+                "1. A browser window will open automatically\n"
+                "2. Sign in or create a Shotgun Account\n"
+                "3. Complete payment if required\n"
+                "4. This window will automatically detect completion",
+                id="instructions",
+            )
+
+        with Vertical(id="actions"):
+            yield Button("Cancel", variant="default", id="cancel")
+
+    def on_mount(self) -> None:
+        """Start authentication flow when screen is mounted."""
+        self.run_worker(self._start_auth_flow(), exclusive=True)
+
+    def action_cancel(self) -> None:
+        """Cancel authentication and close screen."""
+        if self.poll_worker and self.poll_worker.state == WorkerState.RUNNING:
+            self.poll_worker.cancel()
+        self.dismiss(False)
+
+    @on(Button.Pressed, "#cancel")
+    def _on_cancel_pressed(self) -> None:
+        """Handle cancel button press."""
+        self.action_cancel()
+
+    @property
+    def config_manager(self) -> ConfigManager:
+        app = cast("ShotgunApp", self.app)
+        return app.config_manager
+
+    async def _start_auth_flow(self) -> None:
+        """Start the authentication flow."""
+        try:
+            # Get shotgun instance ID from config
+            shotgun_instance_id = self.config_manager.get_shotgun_instance_id()
+            logger.info("Starting auth flow with instance ID: %s", shotgun_instance_id)
+
+            # Update status
+            self.query_one("#status", Label).update(
+                "🔄 Creating authentication token..."
+            )
+
+            # Create unification token
+            client = ShotgunWebClient()
+            response = client.create_unification_token(shotgun_instance_id)
+
+            self.token = response.token
+            self.auth_url = response.auth_url
+
+            logger.info("Auth URL: %s", self.auth_url)
+
+            # Update UI with auth URL
+            self.query_one("#status", Label).update("✅ Authentication URL ready")
+            self.query_one("#auth-url", Markdown).update(
+                f"**Authentication URL:**\n\n[{self.auth_url}]({self.auth_url})"
+            )
+
+            # Try to open browser
+            try:
+                self.query_one("#status", Label).update("🌐 Opening browser...")
+                webbrowser.open(self.auth_url)
+                await asyncio.sleep(1)
+                self.query_one("#status", Label).update(
+                    "⏳ Waiting for authentication... (opened in browser)"
+                )
+            except Exception as e:
+                logger.warning("Failed to open browser: %s", e)
+                self.query_one("#status", Label).update(
+                    "⚠️ Please click the link above to authenticate"
+                )
+
+            # Start polling for status
+            self.poll_worker = self.run_worker(
+                self._poll_token_status(), exclusive=False
+            )
+
+        except httpx.HTTPError as e:
+            logger.error("Failed to create auth token: %s", e)
+            self.query_one("#status", Label).update(
+                f"❌ Error: Failed to create authentication token\n{e}"
+            )
+            self.notify("Failed to start authentication", severity="error")
+
+        except Exception as e:
+            logger.error("Unexpected error during auth flow: %s", e)
+            self.query_one("#status", Label).update(f"❌ Unexpected error: {e}")
+            self.notify("Authentication failed", severity="error")
+
+    async def _poll_token_status(self) -> None:
+        """Poll token status until completed or expired."""
+        if not self.token:
+            logger.error("No token available for polling")
+            return
+
+        client = ShotgunWebClient()
+        poll_count = 0
+        max_polls = 600  # 30 minutes with 3 second intervals
+
+        while poll_count < max_polls:
+            try:
+                await asyncio.sleep(DEFAULT_POLL_INTERVAL_SECONDS)
+                poll_count += 1
+
+                logger.debug(
+                    "Polling token status (attempt %d/%d)", poll_count, max_polls
+                )
+
+                status_response = client.check_token_status(self.token)
+
+                if status_response.status == TokenStatus.COMPLETED:
+                    # Success! Save keys and dismiss
+                    logger.info("Authentication completed successfully")
+
+                    if status_response.litellm_key and status_response.supabase_key:
+                        self.config_manager.update_shotgun_account(
+                            api_key=status_response.litellm_key,
+                            supabase_jwt=status_response.supabase_key,
+                        )
+
+                        self.query_one("#status", Label).update(
+                            "✅ Authentication successful! Saving credentials..."
+                        )
+                        await asyncio.sleep(1)
+                        self.notify(
+                            "Shotgun Account configured successfully!",
+                            severity="information",
+                        )
+                        self.dismiss(True)
+                    else:
+                        logger.error("Completed but missing keys")
+                        self.query_one("#status", Label).update(
+                            "❌ Error: Authentication completed but keys are missing"
+                        )
+                        self.notify("Authentication failed", severity="error")
+                        await asyncio.sleep(3)
+                        self.dismiss(False)
+                    return
+
+                elif status_response.status == TokenStatus.AWAITING_PAYMENT:
+                    self.query_one("#status", Label).update(
+                        "💳 Waiting for payment completion..."
+                    )
+
+                elif status_response.status == TokenStatus.EXPIRED:
+                    logger.error("Token expired")
+                    self.query_one("#status", Label).update(
+                        "❌ Authentication token expired (30 minutes)\n"
+                        "Please try again."
+                    )
+                    self.notify("Authentication token expired", severity="error")
+                    await asyncio.sleep(3)
+                    self.dismiss(False)
+                    return
+
+                elif status_response.status == TokenStatus.PENDING:
+                    # Still waiting, update status message
+                    elapsed_minutes = (poll_count * DEFAULT_POLL_INTERVAL_SECONDS) // 60
+                    self.query_one("#status", Label).update(
+                        f"⏳ Waiting for authentication... ({elapsed_minutes}m elapsed)"
+                    )
+
+            except httpx.HTTPStatusError as e:
+                if e.response.status_code == 410:
+                    # Token expired
+                    logger.error("Token expired (410)")
+                    self.query_one("#status", Label).update(
+                        "❌ Authentication token expired"
+                    )
+                    self.notify("Authentication token expired", severity="error")
+                    await asyncio.sleep(3)
+                    self.dismiss(False)
+                    return
+                else:
+                    logger.error("HTTP error polling status: %s", e)
+                    self.query_one("#status", Label).update(
+                        f"❌ Error checking status: {e}"
+                    )
+                    await asyncio.sleep(5)  # Wait a bit longer on error
+
+            except Exception as e:
+                logger.error("Error polling token status: %s", e)
+                self.query_one("#status", Label).update(f"⚠️ Error checking status: {e}")
+                await asyncio.sleep(5)  # Wait a bit longer on error
+
+        # Timeout reached
+        logger.error("Polling timeout reached")
+        self.query_one("#status", Label).update(
+            "❌ Authentication timeout (30 minutes)\nPlease try again."
+        )
+        self.notify("Authentication timeout", severity="error")
+        await asyncio.sleep(3)
+        self.dismiss(False)

shotgun/tui/screens/welcome.py

@@ -0,0 +1,176 @@
+"""Welcome screen for choosing between Shotgun Account and BYOK."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
+
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal, Vertical
+from textual.screen import Screen
+from textual.widgets import Button, Markdown, Static
+
+if TYPE_CHECKING:
+    from ..app import ShotgunApp
+
+
+class WelcomeScreen(Screen[None]):
+    """Welcome screen for first-time setup."""
+
+    CSS = """
+        WelcomeScreen {
+            layout: vertical;
+            align: center middle;
+        }
+
+        #titlebox {
+            width: 100%;
+            height: auto;
+            margin: 2 0;
+            padding: 1;
+            border: hkey $border;
+            content-align: center middle;
+
+            & > * {
+                text-align: center;
+            }
+        }
+
+        #welcome-title {
+            padding: 1 0;
+            text-style: bold;
+            color: $text-accent;
+        }
+
+        #welcome-subtitle {
+            padding: 0 1;
+        }
+
+        #options-container {
+            width: 100%;
+            height: auto;
+            padding: 2;
+            align: center middle;
+        }
+
+        #options {
+            width: auto;
+            height: auto;
+        }
+
+        .option-box {
+            width: 45;
+            height: auto;
+            border: solid $primary;
+            padding: 2;
+            margin: 0 1;
+            background: $surface;
+        }
+
+        .option-box:focus-within {
+            border: solid $accent;
+        }
+
+        .option-title {
+            text-style: bold;
+            color: $text-accent;
+            padding: 0 0 1 0;
+        }
+
+        .option-benefits {
+            padding: 1 0;
+        }
+
+        .option-button {
+            margin: 1 0 0 0;
+            width: 100%;
+        }
+    """
+
+    BINDINGS = [
+        ("ctrl+c", "app.quit", "Quit"),
+    ]
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="titlebox"):
+            yield Static("Welcome to Shotgun", id="welcome-title")
+            yield Static(
+                "Choose how you'd like to get started",
+                id="welcome-subtitle",
+            )
+
+        with Container(id="options-container"):
+            with Horizontal(id="options"):
+                # Left box - Shotgun Account
+                with Vertical(classes="option-box", id="shotgun-box"):
+                    yield Static("Use a Shotgun Account", classes="option-title")
+                    yield Markdown(
+                        "**Benefits:**\n"
+                        "• Use of all models in the Model Garden\n"
+                        "• We'll pick the optimal models to give you the best "
+                        "experience for things like web search, codebase indexing",
+                        classes="option-benefits",
+                    )
+                    yield Button(
+                        "Sign Up for/Use your Shotgun Account",
+                        variant="primary",
+                        id="shotgun-button",
+                        classes="option-button",
+                    )
+
+                # Right box - BYOK
+                with Vertical(classes="option-box", id="byok-box"):
+                    yield Static("Bring Your Own Key (BYOK)", classes="option-title")
+                    yield Markdown(
+                        "**Benefits:**\n"
+                        "• 100% Supported by the application\n"
+                        "• Use your existing API keys from OpenAI, Anthropic, or Google",
+                        classes="option-benefits",
+                    )
+                    yield Button(
+                        "Configure API Keys",
+                        variant="success",
+                        id="byok-button",
+                        classes="option-button",
+                    )
+
+    def on_mount(self) -> None:
+        """Focus the first button on mount."""
+        self.query_one("#shotgun-button", Button).focus()
+
+    @on(Button.Pressed, "#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")
+    def _on_byok_pressed(self) -> None:
+        """Handle BYOK button press."""
+        self._mark_welcome_shown()
+        # Push provider config screen before dismissing
+        from .provider_config import ProviderConfigScreen
+
+        self.app.push_screen(
+            ProviderConfigScreen(),
+            callback=lambda _arg: self.dismiss(),
+        )
+
+    async def _start_shotgun_auth(self) -> None:
+        """Launch Shotgun Account authentication flow."""
+        from .shotgun_auth import ShotgunAuthScreen
+
+        # Mark welcome screen as shown before auth
+        self._mark_welcome_shown()
+
+        # Push the auth screen and wait for result
+        await self.app.push_screen_wait(ShotgunAuthScreen())
+
+        # Dismiss welcome screen after auth
+        self.dismiss()
+
+    def _mark_welcome_shown(self) -> None:
+        """Mark the welcome screen as shown in config."""
+        app = cast("ShotgunApp", self.app)
+        config = app.config_manager.load()
+        config.shown_welcome_screen = True
+        app.config_manager.save(config)

{shotgun_sh-0.2.1.dev4.dist-info → shotgun_sh-0.2.1.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.1.dev4
+Version: 0.2.1.dev5
 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