shotgun-sh 0.2.11.dev7__py3-none-any.whl → 0.2.23.dev1__py3-none-any.whl

shotgun/tui/screens/chat_screen/history/chat_history.py

@@ -47,7 +47,6 @@ class ChatHistory(Widget):
         super().__init__()
         self.items: Sequence[ModelMessage | HintMessage] = []
         self.vertical_tail: VerticalTail | None = None
-        self.partial_response = None
         self._rendered_count = 0  # Track how many messages have been mounted
 
     def compose(self) -> ComposeResult:
@@ -63,7 +62,7 @@ class ChatHistory(Widget):
                     yield HintMessageWidget(item)
                 elif isinstance(item, ModelResponse):
                     yield AgentResponseWidget(item)
-            yield PartialResponseWidget(self.partial_response).data_bind(
+            yield PartialResponseWidget(None).data_bind(
                 item=ChatHistory.partial_response
             )
 
@@ -93,6 +92,42 @@ class ChatHistory(Widget):
         self.items = messages
         filtered = list(self.filtered_items())
 
+        # Handle case where streaming inflated _rendered_count but final messages differ
+        # This happens when error replaces ModelResponse with HintMessage
+        if len(filtered) <= self._rendered_count and filtered:
+            # Check if the last rendered item type differs from what should be there
+            # Children: [UserQuestion, AgentResponse, ..., PartialResponse]
+            # We need to check the item before PartialResponseWidget
+            num_children = len(self.vertical_tail.children)
+            if num_children > 1:  # Has items besides PartialResponseWidget
+                last_widget = self.vertical_tail.children[-2]  # Item before Partial
+                last_filtered = filtered[-1]
+
+                # Check type mismatch
+                type_mismatch = (
+                    (
+                        isinstance(last_widget, AgentResponseWidget)
+                        and isinstance(last_filtered, HintMessage)
+                    )
+                    or (
+                        isinstance(last_widget, HintMessageWidget)
+                        and isinstance(last_filtered, ModelResponse)
+                    )
+                    or (
+                        isinstance(last_widget, AgentResponseWidget)
+                        and isinstance(last_filtered, ModelRequest)
+                    )
+                    or (
+                        isinstance(last_widget, UserQuestionWidget)
+                        and not isinstance(last_filtered, ModelRequest)
+                    )
+                )
+
+                if type_mismatch:
+                    # Remove the mismatched widget and adjust count
+                    last_widget.remove()
+                    self._rendered_count = len(filtered) - 1
+
         # Only mount new messages that haven't been rendered yet
         if len(filtered) > self._rendered_count:
             new_messages = filtered[self._rendered_count :]

shotgun/tui/screens/directory_setup.py

@@ -1,4 +1,4 @@
-"""Screen for setting up the local .shotgun directory."""
+"""Screen for displaying .shotgun directory creation errors."""
 
 from __future__ import annotations
 
@@ -8,13 +8,20 @@ from textual import on
 from textual.app import ComposeResult
 from textual.containers import Horizontal, Vertical
 from textual.screen import Screen
-from textual.widgets import Button, Static
-
-from shotgun.utils.file_system_utils import ensure_shotgun_directory_exists
+from textual.widgets import Button, Label, Static
 
 
 class DirectorySetupScreen(Screen[None]):
-    """Prompt the user to initialize the .shotgun directory."""
+    """Display an error when .shotgun directory creation fails."""
+
+    def __init__(self, error_message: str) -> None:
+        """Initialize the error screen.
+
+        Args:
+            error_message: The error message to display to the user.
+        """
+        super().__init__()
+        self.error_message = error_message
 
     CSS = """
         DirectorySetupScreen {
@@ -56,58 +63,55 @@ class DirectorySetupScreen(Screen[None]):
         #directory-actions > * {
             margin-right: 2;
         }
+
+        #directory-status {
+            height: auto;
+            padding: 0 1;
+            min-height: 1;
+            color: $error;
+            text-align: center;
+        }
     """
 
     BINDINGS = [
-        ("enter", "confirm", "Initialize"),
+        ("enter", "retry", "Retry"),
         ("escape", "cancel", "Exit"),
     ]
 
     def compose(self) -> ComposeResult:
         with Vertical(id="titlebox"):
-            yield Static("Directory setup", id="directory-setup-title")
-            yield Static("Shotgun keeps workspace data in a .shotgun directory.\n")
-            yield Static("Initialize it in the current directory?\n")
-            yield Static(f"[$foreground-muted]({Path.cwd().resolve()})[/]")
-        with Horizontal(id="directory-actions"):
-            yield Button(
-                "Initialize and proceed \\[ENTER]", variant="primary", id="initialize"
+            yield Static(
+                "Failed to create .shotgun directory", id="directory-setup-title"
+            )
+            yield Static("Shotgun was unable to create the .shotgun directory in:\n")
+            yield Static(f"[$foreground-muted]({Path.cwd().resolve()})[/]\n")
+            yield Static(f"[bold red]Error:[/] {self.error_message}\n")
+            yield Static(
+                "This directory is required for storing workspace data. "
+                "Please check permissions and try again."
             )
-            yield Button("Exit without setup \\[ESC]", variant="default", id="exit")
+        yield Label("", id="directory-status")
+        with Horizontal(id="directory-actions"):
+            yield Button("Retry \\[ENTER]", variant="primary", id="retry")
+            yield Button("Exit \\[ESC]", variant="default", id="exit")
 
     def on_mount(self) -> None:
-        self.set_focus(self.query_one("#initialize", Button))
+        self.set_focus(self.query_one("#retry", Button))
 
-    def action_confirm(self) -> None:
-        self._initialize_directory()
+    def action_retry(self) -> None:
+        """Retry by dismissing the screen, which will trigger refresh_startup_screen."""
+        self.dismiss()
 
     def action_cancel(self) -> None:
-        self._exit_application()
+        """Exit the application."""
+        self.app.exit()
 
-    @on(Button.Pressed, "#initialize")
-    def _on_initialize_pressed(self) -> None:
-        self._initialize_directory()
+    @on(Button.Pressed, "#retry")
+    def _on_retry_pressed(self) -> None:
+        """Retry by dismissing the screen."""
+        self.dismiss()
 
     @on(Button.Pressed, "#exit")
     def _on_exit_pressed(self) -> None:
-        self._exit_application()
-
-    def _initialize_directory(self) -> None:
-        try:
-            path = ensure_shotgun_directory_exists()
-        except Exception as exc:  # pragma: no cover - defensive; textual path
-            self.notify(f"Failed to initialize directory: {exc}", severity="error")
-            return
-
-        # Double-check a directory now exists; guard against unexpected filesystem state.
-        if not path.is_dir():
-            self.notify(
-                "Unable to initialize .shotgun directory due to filesystem conflict.",
-                severity="error",
-            )
-            return
-
-        self.dismiss()
-
-    def _exit_application(self) -> None:
+        """Exit the application."""
         self.app.exit()

shotgun/tui/screens/feedback.py

@@ -76,6 +76,13 @@ class FeedbackScreen(Screen[Feedback | None]):
         #feedback-type-list {
             padding: 1;
         }
+
+        #feedback-status {
+            height: auto;
+            padding: 0 1;
+            min-height: 1;
+            color: $error;
+        }
     """
 
     BINDINGS = [
@@ -96,6 +103,7 @@ class FeedbackScreen(Screen[Feedback | None]):
             "",
             id="feedback-description",
         )
+        yield Label("", id="feedback-status")
         with Horizontal(id="feedback-actions"):
             yield Button("Submit", variant="primary", id="submit")
             yield Button("Cancel \\[ESC]", id="cancel")
@@ -176,9 +184,8 @@ class FeedbackScreen(Screen[Feedback | None]):
         description = text_area.text.strip()
 
         if not description:
-            self.notify(
-                "Please enter a description before submitting.", severity="error"
-            )
+            status_label = self.query_one("#feedback-status", Label)
+            status_label.update("❌ Please enter a description before submitting.")
             return
 
         app = cast("ShotgunApp", self.app)

shotgun/tui/screens/github_issue.py

@@ -6,7 +6,7 @@ from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Vertical
 from textual.screen import ModalScreen
-from textual.widgets import Button, Markdown, Static
+from textual.widgets import Button, Label, Markdown, Static
 
 
 class GitHubIssueScreen(ModalScreen[None]):
@@ -47,6 +47,13 @@ class GitHubIssueScreen(ModalScreen[None]):
             margin: 1 1;
             min-width: 20;
         }
+
+        #issue-status {
+            height: auto;
+            padding: 1;
+            min-height: 1;
+            text-align: center;
+        }
     """
 
     BINDINGS = [
@@ -85,6 +92,7 @@ We review all issues and will respond as soon as possible!
                     id="issue-markdown",
                 )
             with Vertical(id="issue-buttons"):
+                yield Label("", id="issue-status")
                 yield Button(
                     "🐙 Open GitHub Issues", id="github-button", variant="primary"
                 )
@@ -94,7 +102,8 @@ We review all issues and will respond as soon as possible!
     def handle_github(self) -> None:
         """Open GitHub issues page in browser."""
         webbrowser.open("https://github.com/shotgun-sh/shotgun/issues")
-        self.notify("Opening GitHub Issues in your browser...")
+        status_label = self.query_one("#issue-status", Label)
+        status_label.update("✓ Opening GitHub Issues in your browser...")
 
     @on(Button.Pressed, "#close-button")
     def handle_close(self) -> None:

shotgun/tui/screens/model_picker.py

@@ -72,6 +72,11 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
             padding: 1 0;
             }
         }
+        #model-picker-status {
+            height: auto;
+            padding: 0 1;
+            color: $error;
+        }
         #model-actions {
             padding: 1;
         }
@@ -94,6 +99,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 id="model-picker-summary",
             )
         yield ListView(id="model-list")
+        yield Label("", id="model-picker-status")
         with Horizontal(id="model-actions"):
             yield Button("Select \\[ENTER]", variant="primary", id="select")
             yield Button("Done \\[ESC]", id="done")
@@ -349,4 +355,5 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 )
             )
         except Exception as exc:  # pragma: no cover - defensive; textual path
-            self.notify(f"Failed to select model: {exc}", severity="error")
+            status_label = self.query_one("#model-picker-status", Label)
+            status_label.update(f"❌ Failed to select model: {exc}")

shotgun/tui/screens/pipx_migration.py

@@ -8,7 +8,7 @@ from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal, VerticalScroll
 from textual.screen import ModalScreen
-from textual.widgets import Button, Markdown
+from textual.widgets import Button, Label, Markdown
 
 if TYPE_CHECKING:
     pass
@@ -51,6 +51,13 @@ class PipxMigrationScreen(ModalScreen[None]):
             margin: 0 1;
             min-width: 20;
         }
+
+        #migration-status {
+            height: auto;
+            padding: 1;
+            min-height: 1;
+            text-align: center;
+        }
     """
 
     BINDINGS = [
@@ -106,6 +113,7 @@ Or install permanently: `uv tool install shotgun-sh`
                 )
 
                 with Container(id="buttons-container"):
+                    yield Label("", id="migration-status")
                     with Horizontal(id="action-buttons"):
                         yield Button(
                             "Copy Instructions to Clipboard",
@@ -136,16 +144,14 @@ curl -LsSf https://astral.sh/uv/install.sh | sh
 
 # Step 3: Run shotgun with uvx
 uvx shotgun-sh"""
+        status_label = self.query_one("#migration-status", Label)
         try:
             import pyperclip  # type: ignore[import-untyped]  # noqa: PGH003
 
             pyperclip.copy(instructions)
-            self.notify("Copied migration instructions to clipboard!")
+            status_label.update("✓ Copied migration instructions to clipboard!")
         except ImportError:
-            self.notify(
-                "Clipboard not available. See instructions above.",
-                severity="warning",
-            )
+            status_label.update("⚠️ Clipboard not available. See instructions above.")
 
     @on(Button.Pressed, "#continue")
     def _continue(self) -> None:

shotgun/tui/screens/provider_config.py

@@ -77,6 +77,14 @@ class ProviderConfigScreen(Screen[None]):
         #provider-list {
             padding: 1;
         }
+        #provider-status {
+            height: auto;
+            padding: 0 1;
+            min-height: 1;
+        }
+        #provider-status.error {
+            color: $error;
+        }
     """
 
     BINDINGS = [
@@ -103,6 +111,7 @@ class ProviderConfigScreen(Screen[None]):
             password=True,
             id="api-key",
         )
+        yield Label("", id="provider-status")
         with Horizontal(id="provider-actions"):
             yield Button("Save key \\[ENTER]", variant="primary", id="save")
             yield Button("Authenticate", variant="success", id="authenticate")
@@ -280,9 +289,11 @@ class ProviderConfigScreen(Screen[None]):
         """Async implementation of API key saving."""
         input_widget = self.query_one("#api-key", Input)
         api_key = input_widget.value.strip()
+        status_label = self.query_one("#provider-status", Label)
 
         if not api_key:
-            self.notify("Enter an API key before saving.", severity="error")
+            status_label.update("❌ Enter an API key before saving.")
+            status_label.add_class("error")
             return
 
         try:
@@ -291,25 +302,29 @@ class ProviderConfigScreen(Screen[None]):
                 api_key=api_key,
             )
         except Exception as exc:  # pragma: no cover - defensive; textual path
-            self.notify(f"Failed to save key: {exc}", severity="error")
+            status_label.update(f"❌ Failed to save key: {exc}")
+            status_label.add_class("error")
             return
 
         input_widget.value = ""
         await self.refresh_provider_status()
         await self._update_done_button_visibility()
-        self.notify(
-            f"Saved API key for {self._provider_display_name(self.selected_provider)}."
+        status_label.update(
+            f"✓ Saved API key for {self._provider_display_name(self.selected_provider)}."
         )
+        status_label.remove_class("error")
 
     def _clear_api_key(self) -> None:
         self.run_worker(self._do_clear_api_key(), exclusive=True)
 
     async def _do_clear_api_key(self) -> None:
         """Async implementation of API key clearing."""
+        status_label = self.query_one("#provider-status", Label)
         try:
             await self.config_manager.clear_provider_key(self.selected_provider)
         except Exception as exc:  # pragma: no cover - defensive; textual path
-            self.notify(f"Failed to clear key: {exc}", severity="error")
+            status_label.update(f"❌ Failed to clear key: {exc}")
+            status_label.add_class("error")
             return
 
         await self.refresh_provider_status()
@@ -321,9 +336,10 @@ class ProviderConfigScreen(Screen[None]):
             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)}."
+        status_label.update(
+            f"✓ Cleared API key for {self._provider_display_name(self.selected_provider)}."
         )
+        status_label.remove_class("error")
 
     async def _start_shotgun_auth(self) -> None:
         """Launch Shotgun Account authentication flow."""
@@ -335,4 +351,5 @@ class ProviderConfigScreen(Screen[None]):
         # Refresh provider status after auth completes
         if result:
             await self.refresh_provider_status()
-            # Notify handled by auth screen
+            # Auto-dismiss provider config screen after successful auth
+            self.dismiss()

shotgun/tui/screens/shotgun_auth.py

@@ -182,12 +182,10 @@ class ShotgunAuthScreen(Screen[bool]):
             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."""
@@ -224,17 +222,12 @@ class ShotgunAuthScreen(Screen[bool]):
                             "✅ 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
@@ -250,7 +243,6 @@ class ShotgunAuthScreen(Screen[bool]):
                         "❌ Authentication token expired (30 minutes)\n"
                         "Please try again."
                     )
-                    self.notify("Authentication token expired", severity="error")
                     await asyncio.sleep(3)
                     self.dismiss(False)
                     return
@@ -269,7 +261,6 @@ class ShotgunAuthScreen(Screen[bool]):
                     self.query_one("#status", Label).update(
                         "❌ Authentication token expired"
                     )
-                    self.notify("Authentication token expired", severity="error")
                     await asyncio.sleep(3)
                     self.dismiss(False)
                     return
@@ -290,6 +281,5 @@ class ShotgunAuthScreen(Screen[bool]):
         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

@@ -85,6 +85,21 @@ 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;
+        }
     """
 
     BINDINGS = [
@@ -99,6 +114,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

shotgun/tui/widgets/widget_coordinator.py

@@ -166,8 +166,9 @@ class WidgetCoordinator:
 
         try:
             chat_history = self.screen.query_one(ChatHistory)
-            if message:
-                chat_history.partial_response = message
+            # Set the reactive attribute to trigger the PartialResponseWidget update
+            chat_history.partial_response = message
+            # Also update the full message list
             chat_history.update_messages(messages)
         except Exception as e:
             logger.exception(f"Failed to set partial response: {e}")