shotgun-sh 0.4.0.dev2__tar.gz → 0.4.0.dev4__tar.gz

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.4.0.dev2
+Version: 0.4.0.dev4
 Summary: AI-powered research, planning, and task management CLI tool
 Project-URL: Homepage, https://shotgun.sh/
 Project-URL: Repository, https://github.com/shotgun-sh/shotgun

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shotgun-sh"
-version = "0.4.0.dev2"
+version = "0.4.0.dev4"
 description = "AI-powered research, planning, and task management CLI tool"
 readme = "README.md"
 license = { text = "MIT" }

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/agents/agent_manager.py

@@ -78,7 +78,7 @@ from .models import AgentDeps, AgentRuntimeOptions
 from .plan import create_plan_agent
 from .research import create_research_agent
 from .router import create_router_agent
-from .router.models import RouterDeps
+from .router.models import RouterDeps, RouterMode
 from .specify import create_specify_agent
 from .tasks import create_tasks_agent
 
@@ -918,6 +918,8 @@ class AgentManager(Widget):
                 self.ui_message_history.append(
                     HintMessage(message=f"💡 {agent_response.clarifying_questions[0]}")
                 )
+                # Add plan hint for router if plan exists (single question is non-blocking)
+                self._maybe_add_plan_hint(deps)
             else:
                 # Multiple questions (2+) - enter Q&A mode
                 self._qa_questions = agent_response.clarifying_questions
@@ -947,9 +949,8 @@ class AgentManager(Widget):
                         response_text=agent_response.response,
                     )
                 )
-
-            # Add plan hint for router if plan exists
-            self._maybe_add_plan_hint(deps)
+                # NOTE: Don't add plan hint here - defer until Q&A completes
+                # The plan hint will be added after the user answers all questions
 
             # Post UI update with hint messages (file operations will be posted after compaction)
             logger.debug("Posting UI update for Q&A mode with hint messages")
@@ -1384,6 +1385,14 @@ class AgentManager(Widget):
             return
 
         plan_display = deps.current_plan.format_for_display()
+
+        # In drafting mode, if plan is not complete, prompt user to continue
+        if (
+            deps.router_mode == RouterMode.DRAFTING
+            and not deps.current_plan.is_complete()
+        ):
+            plan_display += "\n\n**Shall I continue?**"
+
         logger.debug("Adding plan hint to UI history")
         self.ui_message_history.append(
             HintMessage(message=f"**Current Plan**\n\n{plan_display}")

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/agents/config/README.md

@@ -41,7 +41,6 @@ This directory contains the configuration management system for Shotgun, includi
 - **Title**: "feat: add config migration for streaming capability field (v4->v5)"
 - **Key Changes**:
   - Added `supports_streaming` field to OpenAI config
-  - Added `shown_onboarding_popup` timestamp field
   - Added `supabase_jwt` to Shotgun Account config
 
 ## Migration System

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/agents/config/models.py

@@ -273,10 +273,6 @@ class ShotgunConfig(BaseModel):
         default=False,
         description="Whether the welcome screen has been shown to the user",
     )
-    shown_onboarding_popup: datetime | None = Field(
-        default=None,
-        description="Timestamp when the onboarding popup was shown to the user (ISO8601 format)",
-    )
     marketing: MarketingConfig = Field(
         default_factory=MarketingConfig,
         description="Marketing messages configuration and tracking",

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/agents/router/models.py

@@ -358,6 +358,10 @@ class RouterDeps(AgentDeps):
     # Set by create_plan tool when plan.needs_approval() returns True
     # Excluded from serialization as it's transient UI state
     pending_approval: PendingApproval | None = Field(default=None, exclude=True)
+    # Completion state for Drafting mode
+    # Set by mark_step_done when plan completes in drafting mode
+    # Excluded from serialization as it's transient UI state
+    pending_completion: bool = Field(default=False, exclude=True)
     # Event stream handler for forwarding sub-agent streaming events to UI
     # This is set by the AgentManager when running the router with streaming
     # Excluded from serialization as it's a callable

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/agents/router/tools/plan_tools.py

@@ -167,6 +167,11 @@ async def mark_step_done(
             if plan.is_complete():
                 ctx.deps.is_executing = False
                 logger.debug("Plan complete, is_executing=False")
+                # Set pending completion for Drafting mode
+                # The TUI will detect this and show the completion message
+                if ctx.deps.router_mode == RouterMode.DRAFTING:
+                    ctx.deps.pending_completion = True
+                    logger.debug("Set pending_completion=True for drafting mode")
             # Set pending checkpoint for Planning mode
             # The TUI will detect this and show the StepCheckpointWidget
             elif ctx.deps.router_mode == RouterMode.PLANNING:

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/tui/screens/chat/chat_screen.py

@@ -112,7 +112,6 @@ from shotgun.tui.screens.chat_screen.messages import (
     SubAgentStarted,
 )
 from shotgun.tui.screens.confirmation_dialog import ConfirmationDialog
-from shotgun.tui.screens.onboarding import OnboardingModal
 from shotgun.tui.screens.shared_specs import (
     CreateSpecDialog,
     ShareSpecsAction,
@@ -289,9 +288,6 @@ class ChatScreen(Screen[None]):
         # 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
@@ -575,10 +571,6 @@ class ChatScreen(Screen[None]):
                 HintMessage(message="⚠️ No context analysis available")
             )
 
-    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."""
@@ -988,6 +980,10 @@ class ChatScreen(Screen[None]):
         self, event: MessageHistoryUpdated
     ) -> None:
         """Handle message history updates from the agent manager."""
+        logger.debug(
+            "[MSG_HISTORY] MessageHistoryUpdated received - %d messages",
+            len(event.messages),
+        )
         self._clear_partial_response()
         self.messages = event.messages
 
@@ -1623,6 +1619,9 @@ class ChatScreen(Screen[None]):
         # Check for pending checkpoint (Planning mode step completion)
         self._check_pending_checkpoint()
 
+        # Check for plan completion (Drafting mode)
+        self._check_plan_completion()
+
         # Save conversation after each interaction
         self._save_conversation()
 
@@ -1689,21 +1688,6 @@ class ChatScreen(Screen[None]):
 
         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)
-
     # =========================================================================
     # Step Checkpoint Handlers (Planning Mode)
     # =========================================================================
@@ -1826,6 +1810,31 @@ class ChatScreen(Screen[None]):
             )
         )
 
+    def _check_plan_completion(self) -> None:
+        """Check if a plan was completed in Drafting mode and show completion message.
+
+        This is called after each agent run to check if mark_step_done
+        set pending_completion in Drafting mode.
+        """
+        logger.debug("[PLAN] _check_plan_completion called")
+        if not isinstance(self.deps, RouterDeps):
+            logger.debug("[PLAN] Not RouterDeps, skipping plan completion check")
+            return
+
+        if not self.deps.pending_completion:
+            logger.debug("[PLAN] No pending completion")
+            return
+
+        # Clear the pending state
+        self.deps.pending_completion = False
+
+        # Show completion message
+        logger.debug("[PLAN] Showing plan completion message for drafting mode")
+        self.mount_hint("✅ All plan steps completed!")
+
+        # Hide the plan panel since the plan is done
+        self._hide_plan_panel()
+
     # =========================================================================
     # Sub-Agent Lifecycle Handlers (Stage 8)
     # =========================================================================
@@ -2086,6 +2095,13 @@ class ChatScreen(Screen[None]):
             logger.debug("[PLAN] Not RouterDeps, skipping pending approval check")
             return
 
+        # Don't show plan approval while user is answering questions.
+        # The pending approval will remain set and be checked again
+        # after Q&A completes (when run_agent is called with answers).
+        if self.qa_mode:
+            logger.debug("[PLAN] Q&A mode active, deferring plan approval")
+            return
+
         if self.deps.pending_approval is None:
             logger.debug("[PLAN] No pending approval")
             return

{shotgun_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/tui/screens/chat_screen/command_providers.py

@@ -288,11 +288,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."""
@@ -345,11 +340,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_sh-0.4.0.dev2 → shotgun_sh-0.4.0.dev4}/src/shotgun/tui/screens/chat_screen/history/chat_history.py

@@ -1,5 +1,6 @@
 """Chat history widget - main container for message display."""
 
+import logging
 from collections.abc import Generator, Sequence
 
 from pydantic_ai.messages import (
@@ -21,6 +22,8 @@ from .agent_response import AgentResponseWidget
 from .partial_response import PartialResponseWidget
 from .user_question import UserQuestionWidget
 
+logger = logging.getLogger(__name__)
+
 
 class ChatHistory(Widget):
     """Main widget for displaying chat message history."""
@@ -89,23 +92,44 @@ class ChatHistory(Widget):
     def update_messages(self, messages: list[ModelMessage | HintMessage]) -> None:
         """Update the displayed messages using incremental mounting."""
         if not self.vertical_tail:
+            logger.debug(
+                "[CHAT_HISTORY] update_messages called but vertical_tail is None"
+            )
             return
 
         self.items = messages
         filtered = list(self.filtered_items())
 
+        logger.debug(
+            "[CHAT_HISTORY] update_messages - total=%d, filtered=%d, rendered=%d",
+            len(messages),
+            len(filtered),
+            self._rendered_count,
+        )
+
         # Only mount new messages that haven't been rendered yet
         if len(filtered) > self._rendered_count:
             new_messages = filtered[self._rendered_count :]
+            logger.debug(
+                "[CHAT_HISTORY] Mounting %d new messages",
+                len(new_messages),
+            )
             for item in new_messages:
                 widget: Widget
                 if isinstance(item, ModelRequest):
                     widget = UserQuestionWidget(item)
+                    logger.debug("[CHAT_HISTORY] Mounting UserQuestionWidget")
                 elif isinstance(item, HintMessage):
                     widget = HintMessageWidget(item)
+                    logger.debug("[CHAT_HISTORY] Mounting HintMessageWidget")
                 elif isinstance(item, ModelResponse):
                     widget = AgentResponseWidget(item)
+                    logger.debug("[CHAT_HISTORY] Mounting AgentResponseWidget")
                 else:
+                    logger.debug(
+                        "[CHAT_HISTORY] Skipping unknown message type: %s",
+                        type(item).__name__,
+                    )
                     continue
 
                 # Mount before the PartialResponseWidget
@@ -115,6 +139,12 @@ class ChatHistory(Widget):
 
             # Scroll to bottom to show newly added messages
             self.vertical_tail.scroll_end(animate=False)
+        else:
+            logger.debug(
+                "[CHAT_HISTORY] No new messages to mount (filtered=%d, rendered=%d)",
+                len(filtered),
+                self._rendered_count,
+            )
 
     def on_click(self, event: events.Click) -> None:
         """Focus the prompt input when clicking on the history area."""