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

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

@@ -2,6 +2,8 @@
 
 import asyncio
 import logging
+import time
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import cast
 
@@ -10,6 +12,7 @@ from pydantic_ai.messages import (
     ModelRequest,
     ModelResponse,
     TextPart,
+    ToolCallPart,
     ToolReturnPart,
     UserPromptPart,
 )
@@ -31,6 +34,7 @@ from shotgun.agents.agent_manager import (
     ModelConfigUpdated,
     PartialResponseMessage,
 )
+from shotgun.agents.config import get_config_manager
 from shotgun.agents.config.models import MODEL_SPECS
 from shotgun.agents.conversation_manager import ConversationManager
 from shotgun.agents.history.compaction import apply_persistent_compaction
@@ -45,6 +49,7 @@ from shotgun.codebase.core.manager import (
     CodebaseGraphManager,
 )
 from shotgun.codebase.models import IndexProgress, ProgressPhase
+from shotgun.exceptions import ContextSizeLimitExceeded
 from shotgun.posthog_telemetry import track_event
 from shotgun.sdk.codebase import CodebaseSDK
 from shotgun.sdk.exceptions import CodebaseNotFoundError, InvalidPathError
@@ -70,11 +75,13 @@ from shotgun.tui.screens.chat_screen.command_providers import (
 from shotgun.tui.screens.chat_screen.hint_message import HintMessage
 from shotgun.tui.screens.chat_screen.history import ChatHistory
 from shotgun.tui.screens.confirmation_dialog import ConfirmationDialog
+from shotgun.tui.screens.onboarding import OnboardingModal
 from shotgun.tui.services.conversation_service import ConversationService
 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__)
 
@@ -97,7 +104,6 @@ class ChatScreen(Screen[None]):
     history: PromptHistory = PromptHistory()
     messages = reactive(list[ModelMessage | HintMessage]())
     indexing_job: reactive[CodebaseIndexSelection | None] = reactive(None)
-    partial_message: reactive[ModelMessage | None] = reactive(None)
 
     # Q&A mode state (for structured output clarifying questions)
     qa_mode = reactive(False)
@@ -108,6 +114,10 @@ class ChatScreen(Screen[None]):
     # Working state - keep reactive for Textual watchers
     working = reactive(False)
 
+    # Throttle context indicator updates (in seconds)
+    _last_context_update: float = 0.0
+    _context_update_throttle: float = 5.0  # 5 seconds
+
     def __init__(
         self,
         agent_manager: AgentManager,
@@ -165,13 +175,17 @@ class ChatScreen(Screen[None]):
         self.processing_state.bind_spinner(self.query_one("#spinner", Spinner))
 
         # Load conversation history if --continue flag was provided
-        if self.continue_session and self.conversation_manager.exists():
-            self._load_conversation()
+        # Use call_later to handle async exists() check
+        if self.continue_session:
+            self.call_later(self._check_and_load_conversation)
 
         self.call_later(self.check_if_codebase_is_indexed)
         # Initial update of context indicator
         self.update_context_indicator()
 
+        # Show onboarding popup if not shown before
+        self.call_later(self._check_and_show_onboarding)
+
     async def on_key(self, event: events.Key) -> None:
         """Handle key presses for cancellation."""
         # If escape is pressed during Q&A mode, exit Q&A
@@ -304,6 +318,10 @@ class ChatScreen(Screen[None]):
         else:
             self.notify("No context analysis available", severity="error")
 
+    def action_view_onboarding(self) -> None:
+        """Show the onboarding modal."""
+        self.app.push_screen(OnboardingModal())
+
     @work
     async def action_compact_conversation(self) -> None:
         """Compact the conversation history to reduce size."""
@@ -386,11 +404,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())
@@ -455,7 +473,7 @@ class ChatScreen(Screen[None]):
             self.agent_manager.ui_message_history = []
 
             # Use conversation service to clear conversation
-            self.conversation_service.clear_conversation()
+            await self.conversation_service.clear_conversation()
 
             # Post message history updated event to refresh UI
             self.agent_manager.post_message(
@@ -502,6 +520,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"):
@@ -532,8 +578,6 @@ class ChatScreen(Screen[None]):
 
     @on(PartialResponseMessage)
     def handle_partial_response(self, event: PartialResponseMessage) -> None:
-        self.partial_message = event.message
-
         # Filter event.messages to exclude ModelRequest with only ToolReturnPart
         # These are intermediate tool results that would render as empty (UserQuestionWidget
         # filters out ToolReturnPart in format_prompt_parts), causing user messages to disappear
@@ -551,16 +595,40 @@ 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
         )
 
         # Use widget coordinator to set partial response
-        self.widget_coordinator.set_partial_response(
-            self.partial_message, new_message_list
+        self.widget_coordinator.set_partial_response(event.message, new_message_list)
+
+        # Skip context updates for file write operations (they don't add to input context)
+        has_file_write = any(
+            isinstance(msg, ModelResponse)
+            and any(
+                isinstance(part, ToolCallPart)
+                and part.tool_name in ("write_file", "append_file")
+                for part in msg.parts
+            )
+            for msg in event.messages
         )
 
+        if has_file_write:
+            return  # Skip context update for file writes
+
+        # Throttle context indicator updates to improve performance during streaming
+        # Only update at most once per 5 seconds to avoid excessive token calculations
+        current_time = time.time()
+        if current_time - self._last_context_update >= self._context_update_throttle:
+            self._last_context_update = current_time
+            # 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 +670,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
@@ -617,32 +687,50 @@ class ChatScreen(Screen[None]):
         self.update_context_indicator()
 
         # If there are file operations, add a message showing the modified files
+        # Skip if hint was already added by agent_manager (e.g., in QA mode)
         if event.file_operations:
-            chat_history = self.query_one(ChatHistory)
-            if chat_history.vertical_tail:
-                tracker = FileOperationTracker(operations=event.file_operations)
-                display_path = tracker.get_display_path()
-
-                if display_path:
-                    # Create a simple markdown message with the file path
-                    # The terminal emulator will make this clickable automatically
-                    path_obj = Path(display_path)
-
-                    if len(event.file_operations) == 1:
-                        message = f"📝 Modified: `{display_path}`"
-                    else:
-                        num_files = len({op.file_path for op in event.file_operations})
-                        if path_obj.is_dir():
-                            message = (
-                                f"📁 Modified {num_files} files in: `{display_path}`"
-                            )
+            # Check if file operation hint already exists in recent messages
+            file_hint_exists = any(
+                isinstance(msg, HintMessage)
+                and (
+                    msg.message.startswith("📝 Modified:")
+                    or msg.message.startswith("📁 Modified")
+                )
+                for msg in event.messages[-5:]  # Check last 5 messages
+            )
+
+            if not file_hint_exists:
+                chat_history = self.query_one(ChatHistory)
+                if chat_history.vertical_tail:
+                    tracker = FileOperationTracker(operations=event.file_operations)
+                    display_path = tracker.get_display_path()
+
+                    if display_path:
+                        # Create a simple markdown message with the file path
+                        # The terminal emulator will make this clickable automatically
+                        path_obj = Path(display_path)
+
+                        if len(event.file_operations) == 1:
+                            message = f"📝 Modified: `{display_path}`"
                         else:
-                            # Common path is a file, show parent directory
-                            message = (
-                                f"📁 Modified {num_files} files in: `{path_obj.parent}`"
+                            num_files = len(
+                                {op.file_path for op in event.file_operations}
                             )
+                            if path_obj.is_dir():
+                                message = f"📁 Modified {num_files} files in: `{display_path}`"
+                            else:
+                                # Common path is a file, show parent directory
+                                message = f"📁 Modified {num_files} files in: `{path_obj.parent}`"
+
+                        self.mount_hint(message)
+
+                    # Check and display any marketing messages
+                    from shotgun.tui.app import ShotgunApp
 
-                    self.mount_hint(message)
+                    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:
@@ -1048,6 +1136,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:
@@ -1057,6 +1148,27 @@ class ChatScreen(Screen[None]):
         except asyncio.CancelledError:
             # Handle cancellation gracefully - DO NOT re-raise
             self.mount_hint("⚠️ Operation cancelled by user")
+        except ContextSizeLimitExceeded as e:
+            # User-friendly error with actionable options
+            hint = (
+                f"⚠️ **Context too large for {e.model_name}**\n\n"
+                f"Your conversation history exceeds this model's limit ({e.max_tokens:,} tokens).\n\n"
+                f"**Choose an action:**\n\n"
+                f"1. Switch to a larger model (`Ctrl+P` → Change Model)\n"
+                f"2. Switch to a larger model, compact (`/compact`), then switch back to {e.model_name}\n"
+                f"3. Clear conversation (`/clear`)\n"
+            )
+
+            self.mount_hint(hint)
+
+            # Log for debugging (won't send to Sentry due to ErrorNotPickedUpBySentry)
+            logger.info(
+                "Context size limit exceeded",
+                extra={
+                    "max_tokens": e.max_tokens,
+                    "model_name": e.model_name,
+                },
+            )
         except Exception as e:
             # Log with full stack trace to shotgun.log
             logger.exception(
@@ -1083,6 +1195,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 +1205,50 @@ 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)
+        # Use exclusive=True to prevent concurrent saves that can cause file contention
+        self.run_worker(
+            self.conversation_service.save_conversation(self.agent_manager),
+            exclusive=True,
+        )
+
+    async def _check_and_load_conversation(self) -> None:
+        """Check if conversation exists and load it if it does."""
+        if await self.conversation_manager.exists():
+            self._load_conversation()
 
     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)
+
+    @work
+    async def _check_and_show_onboarding(self) -> None:
+        """Check if onboarding should be shown and display modal if needed."""
+        config_manager = get_config_manager()
+        config = await config_manager.load()
+
+        # Only show onboarding if it hasn't been shown before
+        if config.shown_onboarding_popup is None:
+            # Show the onboarding modal
+            await self.app.push_screen_wait(OnboardingModal())
+
+            # Mark as shown in config with current timestamp
+            config.shown_onboarding_popup = datetime.now(timezone.utc)
+            await config_manager.save(config)

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/chat_screen/command_providers.py

@@ -369,6 +369,11 @@ class UnifiedCommandProvider(Provider):
             self.chat_screen.action_show_usage,
             help="Display usage information for the current session",
         )
+        yield DiscoveryHit(
+            "View Onboarding",
+            self.chat_screen.action_view_onboarding,
+            help="View the onboarding tutorial and helpful resources",
+        )
 
     async def search(self, query: str) -> AsyncGenerator[Hit, None]:
         """Search for commands in alphabetical order."""
@@ -416,6 +421,11 @@ class UnifiedCommandProvider(Provider):
                 self.chat_screen.action_show_usage,
                 "Display usage information for the current session",
             ),
+            (
+                "View Onboarding",
+                self.chat_screen.action_view_onboarding,
+                "View the onboarding tutorial and helpful resources",
+            ),
         ]
 
         for title, callback, help_text in commands:

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
             )
 

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,