shotgun-sh 0.2.11__py3-none-any.whl → 0.2.11.dev2__py3-none-any.whl

shotgun/tui/screens/chat/chat_screen.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import logging
-from datetime import datetime, timezone
 from pathlib import Path
 from typing import cast
 
@@ -32,7 +31,6 @@ 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
@@ -47,7 +45,6 @@ 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
@@ -73,13 +70,11 @@ 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__)
 
@@ -170,17 +165,13 @@ class ChatScreen(Screen[None]):
         self.processing_state.bind_spinner(self.query_one("#spinner", Spinner))
 
         # Load conversation history if --continue flag was provided
-        # Use call_later to handle async exists() check
-        if self.continue_session:
-            self.call_later(self._check_and_load_conversation)
+        if self.continue_session and self.conversation_manager.exists():
+            self._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
@@ -313,10 +304,6 @@ 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."""
@@ -399,11 +386,11 @@ class ChatScreen(Screen[None]):
             # Save to conversation file
             conversation_file = get_shotgun_home() / "conversation.json"
             manager = ConversationManager(conversation_file)
-            conversation = await manager.load()
+            conversation = manager.load()
 
             if conversation:
                 conversation.set_agent_messages(compacted_messages)
-                await manager.save(conversation)
+                manager.save(conversation)
 
             # Post compaction completed event
             self.agent_manager.post_message(CompactionCompletedMessage())
@@ -468,7 +455,7 @@ class ChatScreen(Screen[None]):
             self.agent_manager.ui_message_history = []
 
             # Use conversation service to clear conversation
-            await self.conversation_service.clear_conversation()
+            self.conversation_service.clear_conversation()
 
             # Post message history updated event to refresh UI
             self.agent_manager.post_message(
@@ -515,34 +502,6 @@ 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"):
@@ -592,7 +551,7 @@ class ChatScreen(Screen[None]):
                 # Keep all ModelResponse and other message types
                 filtered_event_messages.append(msg)
 
-        # Build new message list combining existing messages with new streaming content
+        # Build new message list
         new_message_list = self.messages + cast(
             list[ModelMessage | HintMessage], filtered_event_messages
         )
@@ -602,13 +561,6 @@ 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)
@@ -650,9 +602,7 @@ class ChatScreen(Screen[None]):
         self.qa_answers = []
 
     @on(MessageHistoryUpdated)
-    async def handle_message_history_updated(
-        self, event: MessageHistoryUpdated
-    ) -> None:
+    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
@@ -667,50 +617,32 @@ 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:
-            # 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}`"
+            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}`"
+                            )
                         else:
-                            num_files = len(
-                                {op.file_path for op in event.file_operations}
+                            # Common path is a file, show parent directory
+                            message = (
+                                f"📁 Modified {num_files} files in: `{path_obj.parent}`"
                             )
-                            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
-
-                    app = cast(ShotgunApp, self.app)
-                    await MarketingManager.check_and_display_messages(
-                        app.config_manager, event.file_operations, self.mount_hint
-                    )
+                    self.mount_hint(message)
 
     @on(CompactionStartedMessage)
     def handle_compaction_started(self, event: CompactionStartedMessage) -> None:
@@ -1116,9 +1048,6 @@ 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:
@@ -1128,27 +1057,6 @@ 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(
@@ -1175,8 +1083,6 @@ 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()
@@ -1185,50 +1091,20 @@ class ChatScreen(Screen[None]):
 
     def _save_conversation(self) -> None:
         """Save the current conversation to persistent storage."""
-        # 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()
+        # Use conversation service for saving
+        self.conversation_service.save_conversation(self.agent_manager)
 
     def _load_conversation(self) -> None:
         """Load conversation from persistent storage."""
-
-        # Use conversation service for restoration (run async)
-        async def _do_load() -> None:
-            (
-                success,
-                error_msg,
-                restored_type,
-            ) = await self.conversation_service.restore_conversation(
+        # Use conversation service for restoration
+        success, error_msg, restored_type = (
+            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
-
-        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)
+        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

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 - 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"
+        "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"
     )
 
 
@@ -29,12 +29,11 @@ def help_text_empty_dir() -> str:
         Formatted help text string.
     """
     return (
-        "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"
+        "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"
     )

shotgun/tui/screens/chat_screen/command_providers.py

@@ -369,11 +369,6 @@ 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."""
@@ -421,11 +416,6 @@ 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/feedback.py

@@ -125,8 +125,8 @@ class FeedbackScreen(Screen[Feedback | None]):
             self.set_focus(self.query_one("#feedback-description", TextArea))
 
     @on(Button.Pressed, "#submit")
-    async def _on_submit_pressed(self) -> None:
-        await self._submit_feedback()
+    def _on_submit_pressed(self) -> None:
+        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...")
 
-    async def _submit_feedback(self) -> None:
+    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 = await app.config_manager.get_shotgun_instance_id()
+        shotgun_instance_id = 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")
 
-    async def _rebuild_model_list(self) -> None:
+    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 = await config_manager.load(force_reload=True)
+        config = 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 = await self._build_model_items(config)
+        new_items = 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.run_worker(self._rebuild_model_list(), exclusive=False)
+        self._rebuild_model_list()
 
     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.run_worker(self._rebuild_model_list(), exclusive=False)
+        self._rebuild_model_list()
 
     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
 
-    async def refresh_model_labels(self) -> None:
+    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 = await self.config_manager.load(force_reload=True)
+        config = 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,11 +215,9 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 self._model_label(model_name, is_current=model_name == current_model)
             )
 
-    async def _build_model_items(
-        self, config: ShotgunConfig | None = None
-    ) -> list[ListItem]:
+    def _build_model_items(self, config: ShotgunConfig | None = None) -> list[ListItem]:
         if config is None:
-            config = await self.config_manager.load(force_reload=True)
+            config = self.config_manager.load(force_reload=True)
 
         items: list[ListItem] = []
         current_model = self.selected_model
@@ -248,7 +246,9 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 return model_name
         return None
 
-    def _is_model_available(self, model_name: ModelName, config: ShotgunConfig) -> bool:
+    def _is_model_available(
+        self, model_name: ModelName, config: ShotgunConfig | None = None
+    ) -> bool:
         """Check if a model is available based on provider key configuration.
 
         A model is available if:
@@ -257,11 +257,14 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
 
         Args:
             model_name: The model to check availability for
-            config: Pre-loaded config (must be provided)
+            config: Optional pre-loaded config to avoid multiple reloads
 
         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)
@@ -322,21 +325,17 @@ 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 = await self.config_manager.load()
+            config = self.config_manager.load()
             old_model = config.selected_model
 
             # Update the selected model in config
-            await self.config_manager.update_selected_model(self.selected_model)
-            await self.refresh_model_labels()
+            self.config_manager.update_selected_model(self.selected_model)
+            self.refresh_model_labels()
 
             # Get the full model config with provider information
-            model_config = await get_provider_model(self.selected_model)
+            model_config = get_provider_model(self.selected_model)
 
             # Dismiss the screen and return the model config update to the caller
             self.dismiss(