shotgun-sh 0.2.11.dev1__py3-none-any.whl → 0.2.11.dev3__py3-none-any.whl

shotgun/tui/components/context_indicator.py

@@ -1,6 +1,7 @@
 """Context window indicator component for showing model usage."""
 
 from textual.reactive import reactive
+from textual.timer import Timer
 from textual.widgets import Static
 
 from shotgun.agents.config.models import MODEL_SPECS, ModelName
@@ -20,6 +21,10 @@ class ContextIndicator(Static):
 
     context_analysis: reactive[ContextAnalysis | None] = reactive(None)
     model_name: reactive[ModelName | None] = reactive(None)
+    is_streaming: reactive[bool] = reactive(False)
+
+    _animation_frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
+    _animation_index = 0
 
     def __init__(
         self,
@@ -29,6 +34,7 @@ class ContextIndicator(Static):
         classes: str | None = None,
     ) -> None:
         super().__init__(name=name, id=id, classes=classes)
+        self._animation_timer: Timer | None = None
 
     def update_context(
         self, analysis: ContextAnalysis | None, model: ModelName | None
@@ -43,6 +49,38 @@ class ContextIndicator(Static):
         self.model_name = model
         self._refresh_display()
 
+    def set_streaming(self, streaming: bool) -> None:
+        """Enable or disable streaming animation.
+
+        Args:
+            streaming: Whether to show streaming animation
+        """
+        self.is_streaming = streaming
+        if streaming:
+            self._start_animation()
+        else:
+            self._stop_animation()
+
+    def _start_animation(self) -> None:
+        """Start the pulsing animation."""
+        if self._animation_timer is None:
+            self._animation_timer = self.set_interval(0.1, self._animate_frame)
+
+    def _stop_animation(self) -> None:
+        """Stop the pulsing animation."""
+        if self._animation_timer is not None:
+            self._animation_timer.stop()
+            self._animation_timer = None
+        self._animation_index = 0
+        self._refresh_display()
+
+    def _animate_frame(self) -> None:
+        """Advance the animation frame."""
+        self._animation_index = (self._animation_index + 1) % len(
+            self._animation_frames
+        )
+        self._refresh_display()
+
     def _get_percentage_color(self, percentage: float) -> str:
         """Get color for percentage based on threshold.
 
@@ -112,6 +150,11 @@ class ContextIndicator(Static):
             f"[{color}]{percentage}% ({current_tokens}/{max_tokens})[/]",
         ]
 
+        # Add streaming animation indicator if streaming
+        if self.is_streaming:
+            animation_char = self._animation_frames[self._animation_index]
+            parts.append(f"[bold cyan]{animation_char}[/]")
+
         # Add model name if available
         if self.model_name:
             model_spec = MODEL_SPECS.get(self.model_name)

shotgun/tui/containers.py

@@ -5,10 +5,8 @@ from typing import TYPE_CHECKING
 from dependency_injector import containers, providers
 from pydantic_ai import RunContext
 
-from shotgun.agents.agent_manager import AgentManager
-from shotgun.agents.config import get_provider_model
 from shotgun.agents.conversation_manager import ConversationManager
-from shotgun.agents.models import AgentDeps, AgentType
+from shotgun.agents.models import AgentDeps
 from shotgun.sdk.codebase import CodebaseSDK
 from shotgun.tui.commands import CommandHandler
 from shotgun.tui.filtered_codebase_service import FilteredCodebaseService
@@ -35,13 +33,19 @@ class TUIContainer(containers.DeclarativeContainer):
 
     This container manages the lifecycle and dependencies of all TUI components,
     ensuring consistent configuration and facilitating testing.
+
+    Note: model_config and agent_deps are created lazily via async factory methods
+    since get_provider_model() is now async.
     """
 
     # Configuration
     config = providers.Configuration()
 
     # Core dependencies
-    model_config = providers.Singleton(get_provider_model)
+    # TODO: Figure out a better solution for async dependency injection
+    # model_config is now loaded lazily via create_default_tui_deps()
+    # because get_provider_model() is async. This breaks the DI pattern
+    # and should be refactored to support async factories properly.
 
     storage_dir = providers.Singleton(lambda: get_shotgun_home() / "codebases")
 
@@ -51,15 +55,10 @@ class TUIContainer(containers.DeclarativeContainer):
 
     system_prompt_fn = providers.Object(_placeholder_system_prompt)
 
-    # AgentDeps singleton
-    agent_deps = providers.Singleton(
-        AgentDeps,
-        interactive_mode=True,
-        is_tui_context=True,
-        llm_model=model_config,
-        codebase_service=codebase_service,
-        system_prompt_fn=system_prompt_fn,
-    )
+    # TODO: Figure out a better solution for async dependency injection
+    # AgentDeps is now created via async create_default_tui_deps()
+    # instead of using DI container's Singleton provider because it requires
+    # async model_config initialization
 
     # Service singletons
     codebase_sdk = providers.Singleton(CodebaseSDK)
@@ -74,10 +73,9 @@ class TUIContainer(containers.DeclarativeContainer):
         ConversationService, conversation_manager=conversation_manager
     )
 
-    # Factory for AgentManager (needs agent_type parameter)
-    agent_manager_factory = providers.Factory(
-        AgentManager, deps=agent_deps, initial_type=providers.Object(AgentType.RESEARCH)
-    )
+    # TODO: Figure out a better solution for async dependency injection
+    # AgentManager factory removed - create via async initialization
+    # since it requires async agent creation
 
     # Factory for ProcessingStateManager (needs ChatScreen reference)
     processing_state_factory = providers.Factory(

shotgun/tui/dependencies.py

@@ -8,7 +8,7 @@ from shotgun.tui.filtered_codebase_service import FilteredCodebaseService
 from shotgun.utils import get_shotgun_home
 
 
-def create_default_tui_deps() -> AgentDeps:
+async def create_default_tui_deps() -> AgentDeps:
     """Create default AgentDeps for TUI components.
 
     This creates a standard AgentDeps configuration suitable for interactive
@@ -21,7 +21,7 @@ def create_default_tui_deps() -> AgentDeps:
     Returns:
         Configured AgentDeps instance ready for TUI use.
     """
-    model_config = get_provider_model()
+    model_config = await get_provider_model()
     storage_dir = get_shotgun_home() / "codebases"
     codebase_service = FilteredCodebaseService(storage_dir)
 

shotgun/tui/screens/chat/chat_screen.py

@@ -75,6 +75,7 @@ from shotgun.tui.state.processing_state import ProcessingStateManager
 from shotgun.tui.utils.mode_progress import PlaceholderHints
 from shotgun.tui.widgets.widget_coordinator import WidgetCoordinator
 from shotgun.utils import get_shotgun_home
+from shotgun.utils.marketing import MarketingManager
 
 logger = logging.getLogger(__name__)
 
@@ -386,11 +387,11 @@ class ChatScreen(Screen[None]):
             # Save to conversation file
             conversation_file = get_shotgun_home() / "conversation.json"
             manager = ConversationManager(conversation_file)
-            conversation = manager.load()
+            conversation = await manager.load()
 
             if conversation:
                 conversation.set_agent_messages(compacted_messages)
-                manager.save(conversation)
+                await manager.save(conversation)
 
             # Post compaction completed event
             self.agent_manager.post_message(CompactionCompletedMessage())
@@ -502,6 +503,34 @@ class ChatScreen(Screen[None]):
                 f"[CONTEXT] Failed to update context indicator: {e}", exc_info=True
             )
 
+    @work(exclusive=False)
+    async def update_context_indicator_with_messages(
+        self,
+        agent_messages: list[ModelMessage],
+        ui_messages: list[ModelMessage | HintMessage],
+    ) -> None:
+        """Update the context indicator with specific message sets (for streaming updates).
+
+        Args:
+            agent_messages: Agent message history including streaming messages (for token counting)
+            ui_messages: UI message history including hints and streaming messages
+        """
+        try:
+            from shotgun.agents.context_analyzer.analyzer import ContextAnalyzer
+
+            analyzer = ContextAnalyzer(self.deps.llm_model)
+            # Analyze the combined message histories for accurate progressive token counts
+            analysis = await analyzer.analyze_conversation(agent_messages, ui_messages)
+
+            if analysis:
+                model_name = self.deps.llm_model.name
+                self.widget_coordinator.update_context_indicator(analysis, model_name)
+        except Exception as e:
+            logger.error(
+                f"Failed to update context indicator with streaming messages: {e}",
+                exc_info=True,
+            )
+
     def compose(self) -> ComposeResult:
         """Create child widgets for the app."""
         with Container(id="window"):
@@ -551,7 +580,7 @@ class ChatScreen(Screen[None]):
                 # Keep all ModelResponse and other message types
                 filtered_event_messages.append(msg)
 
-        # Build new message list
+        # Build new message list combining existing messages with new streaming content
         new_message_list = self.messages + cast(
             list[ModelMessage | HintMessage], filtered_event_messages
         )
@@ -561,6 +590,13 @@ class ChatScreen(Screen[None]):
             self.partial_message, new_message_list
         )
 
+        # Update context indicator with full message history including streaming messages
+        # Combine existing agent history with new streaming messages for accurate token count
+        combined_agent_history = self.agent_manager.message_history + event.messages
+        self.update_context_indicator_with_messages(
+            combined_agent_history, new_message_list
+        )
+
     def _clear_partial_response(self) -> None:
         # Use widget coordinator to clear partial response
         self.widget_coordinator.set_partial_response(None, self.messages)
@@ -602,7 +638,9 @@ class ChatScreen(Screen[None]):
         self.qa_answers = []
 
     @on(MessageHistoryUpdated)
-    def handle_message_history_updated(self, event: MessageHistoryUpdated) -> None:
+    async def handle_message_history_updated(
+        self, event: MessageHistoryUpdated
+    ) -> None:
         """Handle message history updates from the agent manager."""
         self._clear_partial_response()
         self.messages = event.messages
@@ -644,6 +682,14 @@ class ChatScreen(Screen[None]):
 
                     self.mount_hint(message)
 
+                    # Check and display any marketing messages
+                    from shotgun.tui.app import ShotgunApp
+
+                    app = cast(ShotgunApp, self.app)
+                    await MarketingManager.check_and_display_messages(
+                        app.config_manager, event.file_operations, self.mount_hint
+                    )
+
     @on(CompactionStartedMessage)
     def handle_compaction_started(self, event: CompactionStartedMessage) -> None:
         """Update spinner text when compaction starts."""
@@ -1048,6 +1094,9 @@ class ChatScreen(Screen[None]):
         self.processing_state.start_processing("Processing...")
         self.processing_state.bind_worker(get_current_worker())
 
+        # Start context indicator animation immediately
+        self.widget_coordinator.set_context_streaming(True)
+
         prompt = message
 
         try:
@@ -1083,6 +1132,8 @@ class ChatScreen(Screen[None]):
             self.mount_hint(hint)
         finally:
             self.processing_state.stop_processing()
+            # Stop context indicator animation
+            self.widget_coordinator.set_context_streaming(False)
 
         # Save conversation after each interaction
         self._save_conversation()
@@ -1091,20 +1142,29 @@ class ChatScreen(Screen[None]):
 
     def _save_conversation(self) -> None:
         """Save the current conversation to persistent storage."""
-        # Use conversation service for saving
-        self.conversation_service.save_conversation(self.agent_manager)
+        # Use conversation service for saving (run async in background)
+        self.run_worker(
+            self.conversation_service.save_conversation(self.agent_manager),
+            exclusive=False,
+        )
 
     def _load_conversation(self) -> None:
         """Load conversation from persistent storage."""
-        # Use conversation service for restoration
-        success, error_msg, restored_type = (
-            self.conversation_service.restore_conversation(
+
+        # Use conversation service for restoration (run async)
+        async def _do_load() -> None:
+            (
+                success,
+                error_msg,
+                restored_type,
+            ) = await self.conversation_service.restore_conversation(
                 self.agent_manager, self.deps.usage_manager
             )
-        )
 
-        if not success and error_msg:
-            self.mount_hint(error_msg)
-        elif success and restored_type:
-            # Update the current mode to match restored conversation
-            self.mode = restored_type
+            if not success and error_msg:
+                self.mount_hint(error_msg)
+            elif success and restored_type:
+                # Update the current mode to match restored conversation
+                self.mode = restored_type
+
+        self.run_worker(_do_load(), exclusive=False)

shotgun/tui/screens/chat/help_text.py

@@ -11,14 +11,14 @@ def help_text_with_codebase(already_indexed: bool = False) -> str:
         Formatted help text string.
     """
     return (
-        "Howdy! Welcome to Shotgun - the context tool for software engineering. \n\n"
-        "You can research, build specs, plan, create tasks, and export context to your "
-        "favorite code-gen agents.\n\n"
-        f"{'' if already_indexed else 'Once your codebase is indexed, '}I can help with:\n\n"
-        "- Speccing out a new feature\n"
-        "- Onboarding you onto this project\n"
-        "- Helping with a refactor spec\n"
-        "- Creating AGENTS.md file for this project\n"
+        "Howdy! Welcome to Shotgun - Spec Driven Development for Developers and AI Agents.\n\n"
+        "Shotgun writes codebase-aware specs for your AI coding agents so they don't derail.\n\n"
+        f"{'It' if already_indexed else 'Once your codebase is indexed, it'} can help you:\n"
+        "- Research your codebase and spec out new features\n"
+        "- Create implementation plans that fit your architecture\n"
+        "- Generate AGENTS.md files for AI coding agents\n"
+        "- Onboard to existing projects or plan refactors\n\n"
+        "Ready to build something? Let's go.\n"
     )
 
 
@@ -29,11 +29,12 @@ def help_text_empty_dir() -> str:
         Formatted help text string.
     """
     return (
-        "Howdy! Welcome to Shotgun - the context tool for software engineering.\n\n"
-        "You can research, build specs, plan, create tasks, and export context to your "
-        "favorite code-gen agents.\n\n"
-        "What would you like to build? Here are some examples:\n\n"
-        "- Research FastAPI vs Django\n"
-        "- Plan my new web app using React\n"
-        "- Create PRD for my planned product\n"
+        "Howdy! Welcome to Shotgun - Spec Driven Development for Developers and AI Agents.\n\n"
+        "Shotgun writes codebase-aware specs for your AI coding agents so they don't derail.\n\n"
+        "It can help you:\n"
+        "- Research your codebase and spec out new features\n"
+        "- Create implementation plans that fit your architecture\n"
+        "- Generate AGENTS.md files for AI coding agents\n"
+        "- Onboard to existing projects or plan refactors\n\n"
+        "Ready to build something? Let's go.\n"
     )

shotgun/tui/screens/feedback.py

@@ -125,8 +125,8 @@ class FeedbackScreen(Screen[Feedback | None]):
             self.set_focus(self.query_one("#feedback-description", TextArea))
 
     @on(Button.Pressed, "#submit")
-    def _on_submit_pressed(self) -> None:
-        self._submit_feedback()
+    async def _on_submit_pressed(self) -> None:
+        await self._submit_feedback()
 
     @on(Button.Pressed, "#cancel")
     def _on_cancel_pressed(self) -> None:
@@ -171,7 +171,7 @@ class FeedbackScreen(Screen[Feedback | None]):
         }
         return placeholders.get(kind, "Enter your feedback...")
 
-    def _submit_feedback(self) -> None:
+    async def _submit_feedback(self) -> None:
         text_area = self.query_one("#feedback-description", TextArea)
         description = text_area.text.strip()
 
@@ -182,7 +182,7 @@ class FeedbackScreen(Screen[Feedback | None]):
             return
 
         app = cast("ShotgunApp", self.app)
-        shotgun_instance_id = app.config_manager.get_shotgun_instance_id()
+        shotgun_instance_id = await app.config_manager.get_shotgun_instance_id()
 
         feedback = Feedback(
             kind=self.selected_kind,

shotgun/tui/screens/model_picker.py

@@ -98,7 +98,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
             yield Button("Select \\[ENTER]", variant="primary", id="select")
             yield Button("Done \\[ESC]", id="done")
 
-    def _rebuild_model_list(self) -> None:
+    async def _rebuild_model_list(self) -> None:
         """Rebuild the model list from current config.
 
         This method is called both on first show and when screen is resumed
@@ -108,7 +108,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
 
         # Load current config with force_reload to get latest API keys
         config_manager = self.config_manager
-        config = config_manager.load(force_reload=True)
+        config = await config_manager.load(force_reload=True)
 
         # Log provider key status
         logger.debug(
@@ -133,7 +133,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
         logger.debug("Removed %d existing model items from list", old_count)
 
         # Add new items (labels already have correct text including current indicator)
-        new_items = self._build_model_items(config)
+        new_items = await self._build_model_items(config)
         for item in new_items:
             list_view.append(item)
         logger.debug("Added %d available model items to list", len(new_items))
@@ -153,7 +153,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
     def on_show(self) -> None:
         """Rebuild model list when screen is first shown."""
         logger.debug("ModelPickerScreen.on_show() called")
-        self._rebuild_model_list()
+        self.run_worker(self._rebuild_model_list(), exclusive=False)
 
     def on_screenresume(self) -> None:
         """Rebuild model list when screen is resumed (subsequent visits).
@@ -162,7 +162,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
         ensuring the model list reflects any config changes made while away.
         """
         logger.debug("ModelPickerScreen.on_screenresume() called")
-        self._rebuild_model_list()
+        self.run_worker(self._rebuild_model_list(), exclusive=False)
 
     def action_done(self) -> None:
         self.dismiss()
@@ -193,14 +193,14 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
         app = cast("ShotgunApp", self.app)
         return app.config_manager
 
-    def refresh_model_labels(self) -> None:
+    async def refresh_model_labels(self) -> None:
         """Update the list view entries to reflect current selection.
 
         Note: This method only updates labels for currently displayed models.
         To rebuild the entire list after provider changes, on_show() should be used.
         """
         # Load config once with force_reload
-        config = self.config_manager.load(force_reload=True)
+        config = await self.config_manager.load(force_reload=True)
         current_model = config.selected_model or get_default_model_for_provider(config)
 
         # Update labels for available models only
@@ -215,9 +215,11 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 self._model_label(model_name, is_current=model_name == current_model)
             )
 
-    def _build_model_items(self, config: ShotgunConfig | None = None) -> list[ListItem]:
+    async def _build_model_items(
+        self, config: ShotgunConfig | None = None
+    ) -> list[ListItem]:
         if config is None:
-            config = self.config_manager.load(force_reload=True)
+            config = await self.config_manager.load(force_reload=True)
 
         items: list[ListItem] = []
         current_model = self.selected_model
@@ -246,9 +248,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 return model_name
         return None
 
-    def _is_model_available(
-        self, model_name: ModelName, config: ShotgunConfig | None = None
-    ) -> bool:
+    def _is_model_available(self, model_name: ModelName, config: ShotgunConfig) -> bool:
         """Check if a model is available based on provider key configuration.
 
         A model is available if:
@@ -257,14 +257,11 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
 
         Args:
             model_name: The model to check availability for
-            config: Optional pre-loaded config to avoid multiple reloads
+            config: Pre-loaded config (must be provided)
 
         Returns:
             True if the model can be used, False otherwise
         """
-        if config is None:
-            config = self.config_manager.load(force_reload=True)
-
         # If Shotgun Account is configured, all models are available
         if self.config_manager._provider_has_api_key(config.shotgun):
             logger.debug("Model %s available (Shotgun Account configured)", model_name)
@@ -325,17 +322,21 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
 
     def _select_model(self) -> None:
         """Save the selected model."""
+        self.run_worker(self._do_select_model(), exclusive=True)
+
+    async def _do_select_model(self) -> None:
+        """Async implementation of model selection."""
         try:
             # Get old model before updating
-            config = self.config_manager.load()
+            config = await self.config_manager.load()
             old_model = config.selected_model
 
             # Update the selected model in config
-            self.config_manager.update_selected_model(self.selected_model)
-            self.refresh_model_labels()
+            await self.config_manager.update_selected_model(self.selected_model)
+            await self.refresh_model_labels()
 
             # Get the full model config with provider information
-            model_config = get_provider_model(self.selected_model)
+            model_config = await get_provider_model(self.selected_model)
 
             # Dismiss the screen and return the model config update to the caller
             self.dismiss(