shotgun-sh 0.3.3.dev1__py3-none-any.whl → 0.4.0.dev1__py3-none-any.whl

shotgun/tui/screens/chat/chat_screen.py

@@ -5,7 +5,10 @@ import logging
 import time
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import cast
+from typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:
+    from shotgun.agents.router.models import ExecutionStep
 
 from pydantic_ai.messages import (
     ModelMessage,
@@ -33,6 +36,8 @@ from shotgun.agents.agent_manager import (
     MessageHistoryUpdated,
     ModelConfigUpdated,
     PartialResponseMessage,
+    ToolExecutionStartedMessage,
+    ToolStreamingProgressMessage,
 )
 from shotgun.agents.config import get_config_manager
 from shotgun.agents.config.models import MODEL_SPECS
@@ -46,6 +51,13 @@ from shotgun.agents.models import (
     AgentType,
     FileOperationTracker,
 )
+from shotgun.agents.router.models import (
+    CascadeScope,
+    ExecutionPlan,
+    PlanApprovalStatus,
+    RouterDeps,
+    RouterMode,
+)
 from shotgun.agents.runner import AgentRunner
 from shotgun.codebase.core.manager import (
     CodebaseAlreadyIndexedError,
@@ -83,6 +95,22 @@ 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.chat_screen.messages import (
+    CascadeConfirmationRequired,
+    CascadeConfirmed,
+    CascadeDeclined,
+    CheckpointContinue,
+    CheckpointModify,
+    CheckpointStop,
+    PlanApprovalRequired,
+    PlanApproved,
+    PlanPanelClosed,
+    PlanRejected,
+    PlanUpdated,
+    StepCompleted,
+    SubAgentCompleted,
+    SubAgentStarted,
+)
 from shotgun.tui.screens.confirmation_dialog import ConfirmationDialog
 from shotgun.tui.screens.onboarding import OnboardingModal
 from shotgun.tui.screens.shared_specs import (
@@ -94,6 +122,10 @@ from shotgun.tui.screens.shared_specs import (
 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.approval_widget import PlanApprovalWidget
+from shotgun.tui.widgets.cascade_confirmation_widget import CascadeConfirmationWidget
+from shotgun.tui.widgets.plan_panel import PlanPanelWidget
+from shotgun.tui.widgets.step_checkpoint_widget import StepCheckpointWidget
 from shotgun.tui.widgets.widget_coordinator import WidgetCoordinator
 from shotgun.utils import get_shotgun_home
 from shotgun.utils.file_system_utils import get_shotgun_base_path
@@ -161,6 +193,18 @@ class ChatScreen(Screen[None]):
     _last_context_update: float = 0.0
     _context_update_throttle: float = 5.0  # 5 seconds
 
+    # Step checkpoint widget (Planning mode)
+    _checkpoint_widget: StepCheckpointWidget | None = None
+
+    # Cascade confirmation widget (Planning mode)
+    _cascade_widget: CascadeConfirmationWidget | None = None
+
+    # Plan approval widget (Planning mode)
+    _approval_widget: PlanApprovalWidget | None = None
+
+    # Plan panel widget (Stage 11)
+    _plan_panel: PlanPanelWidget | None = None
+
     def __init__(
         self,
         agent_manager: AgentManager,
@@ -199,6 +243,11 @@ class ChatScreen(Screen[None]):
 
         # All dependencies are now required and injected
         self.deps = deps
+
+        # Wire up plan change callback for Plan Panel (Stage 11)
+        if isinstance(deps, RouterDeps):
+            deps.on_plan_changed = self._on_plan_changed
+
         self.codebase_sdk = codebase_sdk
         self.agent_manager = agent_manager
         self.command_handler = command_handler
@@ -211,6 +260,10 @@ class ChatScreen(Screen[None]):
         self.force_reindex = force_reindex
         self.show_pull_hint = show_pull_hint
 
+        # Initialize mode from agent_manager before compose() runs
+        # This ensures ModeIndicator shows correct mode on first render
+        self.mode = agent_manager._current_agent_type
+
     def on_mount(self) -> None:
         # Use widget coordinator to focus input
         self.widget_coordinator.update_prompt_input(focus=True)
@@ -220,6 +273,9 @@ class ChatScreen(Screen[None]):
         # Bind spinner to processing state manager
         self.processing_state.bind_spinner(self.query_one("#spinner", Spinner))
 
+        # Load saved router mode if using Router agent
+        self.call_later(self._load_saved_router_mode)
+
         # Load conversation history if --continue flag was provided
         # Use call_later to handle async exists() check
         if self.continue_session:
@@ -331,7 +387,36 @@ class ChatScreen(Screen[None]):
             # Use widget coordinator for all widget updates
             self.widget_coordinator.update_messages(messages)
 
+    # =========================================================================
+    # Router State Properties (for Protocol compliance)
+    # =========================================================================
+
+    @property
+    def router_mode(self) -> str | None:
+        """Get the current router mode for RouterModeProvider protocol.
+
+        Returns:
+            'planning' or 'drafting' if using router agent, None otherwise.
+        """
+        if isinstance(self.deps, RouterDeps):
+            return self.deps.router_mode.value
+        return None
+
+    @property
+    def active_sub_agent(self) -> str | None:
+        """Get the active sub-agent for ActiveSubAgentProvider protocol.
+
+        Returns:
+            The sub-agent type string if executing, None otherwise.
+        """
+        if isinstance(self.deps, RouterDeps) and self.deps.active_sub_agent:
+            return self.deps.active_sub_agent.value
+        return None
+
     def action_toggle_mode(self) -> None:
+        """Toggle between Planning and Drafting modes for Router."""
+        from shotgun.agents.router.models import RouterDeps, RouterMode
+
         # Prevent mode switching during Q&A
         if self.qa_mode:
             self.agent_manager.add_hint_message(
@@ -339,18 +424,72 @@ class ChatScreen(Screen[None]):
             )
             return
 
-        modes = [
-            AgentType.RESEARCH,
-            AgentType.SPECIFY,
-            AgentType.PLAN,
-            AgentType.TASKS,
-            AgentType.EXPORT,
-        ]
-        self.mode = modes[(modes.index(self.mode) + 1) % len(modes)]
-        self.agent_manager.set_agent(self.mode)
-        # Re-focus input after mode change
+        if not isinstance(self.deps, RouterDeps):
+            return
+
+        # Prevent mode switching during execution
+        if self.deps.is_executing:
+            self.agent_manager.add_hint_message(
+                HintMessage(message="⚠️ Cannot switch modes during plan execution")
+            )
+            return
+
+        # Prevent mode switching while sub-agent is active
+        if self.deps.active_sub_agent is not None:
+            self.agent_manager.add_hint_message(
+                HintMessage(message="⚠️ Cannot switch modes while sub-agent is running")
+            )
+            return
+
+        # Toggle mode
+        if self.deps.router_mode == RouterMode.PLANNING:
+            self.deps.router_mode = RouterMode.DRAFTING
+            mode_name = "Drafting"
+        else:
+            self.deps.router_mode = RouterMode.PLANNING
+            mode_name = "Planning"
+            # Clear plan when switching back to Planning mode
+            # This forces the agent to create a new plan for the next request
+            self.deps.current_plan = None
+            self.deps.approval_status = PlanApprovalStatus.SKIPPED
+            self.deps.is_executing = False
+
+        # Persist mode (fire-and-forget)
+        self._save_router_mode(self.deps.router_mode.value)
+
+        # Show mode change feedback
+        self.agent_manager.add_hint_message(
+            HintMessage(message=f"Switched to {mode_name} mode")
+        )
+
+        # Update UI
+        self.widget_coordinator.update_for_mode_change(self.mode)
         self.call_later(lambda: self.widget_coordinator.update_prompt_input(focus=True))
 
+    def _save_router_mode(self, mode: str) -> None:
+        """Save router mode to config (fire-and-forget)."""
+
+        async def _save() -> None:
+            config_manager = get_config_manager()
+            await config_manager.set_router_mode(mode)
+
+        asyncio.create_task(_save())
+
+    async def _load_saved_router_mode(self) -> None:
+        """Load saved router mode from config."""
+        from shotgun.agents.router.models import RouterDeps, RouterMode
+
+        if isinstance(self.deps, RouterDeps):
+            config_manager = get_config_manager()
+            saved_mode = await config_manager.get_router_mode()
+
+            if saved_mode == "drafting":
+                self.deps.router_mode = RouterMode.DRAFTING
+            else:
+                self.deps.router_mode = RouterMode.PLANNING
+
+            logger.debug("Loaded router mode from config: %s", saved_mode)
+
     async def action_show_usage(self) -> None:
         usage_hint = self.agent_manager.get_usage_hint()
         logger.info(f"Usage hint: {usage_hint}")
@@ -786,6 +925,12 @@ class ChatScreen(Screen[None]):
         if has_file_write:
             return  # Skip context update for file writes
 
+        # Skip context updates when a sub-agent is streaming
+        # Sub-agents run with isolated message history, so their streaming doesn't
+        # represent the router's actual context usage
+        if isinstance(self.deps, RouterDeps) and self.deps.active_sub_agent is not None:
+            return  # Skip context update for sub-agent streaming
+
         # 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()
@@ -913,6 +1058,29 @@ class ChatScreen(Screen[None]):
         # Use widget coordinator to update spinner text
         self.widget_coordinator.update_spinner_text("Processing...")
 
+    @on(ToolExecutionStartedMessage)
+    def handle_tool_execution_started(self, event: ToolExecutionStartedMessage) -> None:
+        """Update spinner text when a tool starts executing.
+
+        This provides visual feedback during long-running tool executions
+        like web search, so the UI doesn't appear frozen.
+        """
+        self.widget_coordinator.update_spinner_text(event.spinner_text)
+
+    @on(ToolStreamingProgressMessage)
+    def handle_tool_streaming_progress(
+        self, event: ToolStreamingProgressMessage
+    ) -> None:
+        """Update spinner text with token count during tool streaming.
+
+        Shows progress while tool arguments are streaming in,
+        particularly useful for long file writes.
+        """
+        text = f"{event.spinner_text} (~{event.streamed_tokens:,} tokens)"
+        self.widget_coordinator.update_spinner_text(text)
+        # Force immediate refresh to show progress
+        self.refresh()
+
     async def handle_model_selected(self, result: ModelConfigUpdated | None) -> None:
         """Handle model selection from ModelPickerScreen.
 
@@ -1449,6 +1617,12 @@ class ChatScreen(Screen[None]):
             if self.deps.llm_model.is_shotgun_account:
                 await self._check_low_balance_warning()
 
+        # Check for pending approval (Planning mode multi-step plan creation)
+        self._check_pending_approval()
+
+        # Check for pending checkpoint (Planning mode step completion)
+        self._check_pending_checkpoint()
+
         # Save conversation after each interaction
         self._save_conversation()
 
@@ -1529,3 +1703,461 @@ class ChatScreen(Screen[None]):
             # 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)
+    # =========================================================================
+
+    @on(StepCompleted)
+    def handle_step_completed(self, event: StepCompleted) -> None:
+        """Show checkpoint widget when a step completes in Planning mode.
+
+        This handler is triggered after mark_step_done is called and sets
+        up a pending checkpoint. It shows the StepCheckpointWidget to let
+        the user decide whether to continue, modify, or stop.
+        """
+        if not isinstance(self.deps, RouterDeps):
+            return
+        if self.deps.router_mode != RouterMode.PLANNING:
+            return
+
+        # Show checkpoint widget
+        self._show_checkpoint_widget(event.step, event.next_step)
+
+    @on(CheckpointContinue)
+    def handle_checkpoint_continue(self) -> None:
+        """Continue to next step when user approves at checkpoint."""
+        self._hide_checkpoint_widget()
+        self._execute_next_step()
+
+    @on(CheckpointModify)
+    def handle_checkpoint_modify(self) -> None:
+        """Return to prompt input for plan modification."""
+        self._hide_checkpoint_widget()
+
+        if isinstance(self.deps, RouterDeps):
+            self.deps.is_executing = False
+
+        self.widget_coordinator.update_prompt_input(focus=True)
+
+    @on(CheckpointStop)
+    def handle_checkpoint_stop(self) -> None:
+        """Stop execution, keep remaining steps as pending."""
+        self._hide_checkpoint_widget()
+
+        if isinstance(self.deps, RouterDeps):
+            self.deps.is_executing = False
+
+        # Show confirmation message
+        self.mount_hint("⏸️ Execution stopped. Remaining steps are still in the plan.")
+        self.widget_coordinator.update_prompt_input(focus=True)
+
+    def _show_checkpoint_widget(
+        self,
+        step: "ExecutionStep",
+        next_step: "ExecutionStep | None",
+    ) -> None:
+        """Replace PromptInput with StepCheckpointWidget.
+
+        Args:
+            step: The step that was just completed.
+            next_step: The next step to execute, or None if last step.
+        """
+        # Create the checkpoint widget
+        self._checkpoint_widget = StepCheckpointWidget(step, next_step)
+
+        # Hide PromptInput
+        prompt_input = self.query_one(PromptInput)
+        prompt_input.display = False
+
+        # Mount checkpoint widget in footer
+        footer = self.query_one("#footer")
+        footer.mount(self._checkpoint_widget, after=prompt_input)
+
+    def _hide_checkpoint_widget(self) -> None:
+        """Remove checkpoint widget, restore PromptInput."""
+        if hasattr(self, "_checkpoint_widget") and self._checkpoint_widget:
+            self._checkpoint_widget.remove()
+            self._checkpoint_widget = None
+
+        # Show PromptInput
+        prompt_input = self.query_one(PromptInput)
+        prompt_input.display = True
+
+    def _execute_next_step(self) -> None:
+        """Execute the next step in the plan."""
+        if not isinstance(self.deps, RouterDeps) or not self.deps.current_plan:
+            return
+
+        # Advance to next step
+        plan = self.deps.current_plan
+        plan.current_step_index += 1
+
+        next_step = plan.current_step()
+        if next_step:
+            # Resume router execution for the next step
+            self.run_agent(f"Continue with next step: {next_step.title}")
+        else:
+            # Plan complete
+            self.deps.is_executing = False
+            self.mount_hint("✅ All plan steps completed!")
+            self.widget_coordinator.update_prompt_input(focus=True)
+
+    def _check_pending_checkpoint(self) -> None:
+        """Check if there's a pending checkpoint and post StepCompleted if so.
+
+        This is called after each agent run to check if mark_step_done
+        set a pending checkpoint in Planning mode.
+        """
+        if not isinstance(self.deps, RouterDeps):
+            return
+
+        if self.deps.pending_checkpoint is None:
+            return
+
+        # Extract checkpoint data and clear the pending state
+        checkpoint = self.deps.pending_checkpoint
+        self.deps.pending_checkpoint = None
+
+        # Post the StepCompleted message to trigger the checkpoint UI
+        self.post_message(
+            StepCompleted(
+                step=checkpoint.completed_step, next_step=checkpoint.next_step
+            )
+        )
+
+    # =========================================================================
+    # Sub-Agent Lifecycle Handlers (Stage 8)
+    # =========================================================================
+
+    @on(SubAgentStarted)
+    def handle_sub_agent_started(self, event: SubAgentStarted) -> None:
+        """Update mode indicator when router delegates to a sub-agent.
+
+        Sets the active_sub_agent in RouterDeps and refreshes the mode
+        indicator to show "📋 Planning → Research" format.
+        """
+        if isinstance(self.deps, RouterDeps):
+            self.deps.active_sub_agent = event.agent_type
+            self.widget_coordinator.refresh_mode_indicator()
+
+    @on(SubAgentCompleted)
+    def handle_sub_agent_completed(self, event: SubAgentCompleted) -> None:
+        """Clear sub-agent display when delegation completes.
+
+        Clears the active_sub_agent in RouterDeps and refreshes the mode
+        indicator to show just the mode name.
+        """
+        if isinstance(self.deps, RouterDeps):
+            self.deps.active_sub_agent = None
+            self.widget_coordinator.refresh_mode_indicator()
+
+    # =========================================================================
+    # Cascade Confirmation Handlers (Planning Mode)
+    # =========================================================================
+
+    @on(CascadeConfirmationRequired)
+    def handle_cascade_confirmation_required(
+        self, event: CascadeConfirmationRequired
+    ) -> None:
+        """Show cascade confirmation widget when a file with dependents is updated.
+
+        In Planning mode, after updating a file like specification.md that has
+        dependent files, this shows the CascadeConfirmationWidget to let the
+        user decide which dependent files should also be updated.
+        """
+        if not isinstance(self.deps, RouterDeps):
+            return
+        if self.deps.router_mode != RouterMode.PLANNING:
+            # In Drafting mode, auto-cascade without confirmation
+            self._execute_cascade(CascadeScope.ALL, event.dependent_files)
+            return
+
+        # Show cascade confirmation widget
+        self._show_cascade_widget(event.updated_file, event.dependent_files)
+
+    @on(CascadeConfirmed)
+    def handle_cascade_confirmed(self, event: CascadeConfirmed) -> None:
+        """Execute cascade update based on user's selected scope."""
+        # Get dependent files from the widget before hiding it
+        dependent_files: list[str] = []
+        if self._cascade_widget:
+            dependent_files = self._cascade_widget.dependent_files
+
+        self._hide_cascade_widget()
+        self._execute_cascade(event.scope, dependent_files)
+
+    @on(CascadeDeclined)
+    def handle_cascade_declined(self) -> None:
+        """Handle user declining cascade update."""
+        self._hide_cascade_widget()
+        self.mount_hint(
+            "ℹ️ Cascade update skipped. You can update dependent files manually."
+        )
+        self.widget_coordinator.update_prompt_input(focus=True)
+
+    def _show_cascade_widget(
+        self,
+        updated_file: str,
+        dependent_files: list[str],
+    ) -> None:
+        """Replace PromptInput with CascadeConfirmationWidget.
+
+        Args:
+            updated_file: The file that was just updated.
+            dependent_files: List of files that depend on the updated file.
+        """
+        # Create the cascade confirmation widget
+        self._cascade_widget = CascadeConfirmationWidget(updated_file, dependent_files)
+
+        # Hide PromptInput
+        prompt_input = self.query_one(PromptInput)
+        prompt_input.display = False
+
+        # Mount cascade widget in footer
+        footer = self.query_one("#footer")
+        footer.mount(self._cascade_widget, after=prompt_input)
+
+    def _hide_cascade_widget(self) -> None:
+        """Remove cascade widget, restore PromptInput."""
+        if self._cascade_widget:
+            self._cascade_widget.remove()
+            self._cascade_widget = None
+
+        # Show PromptInput
+        prompt_input = self.query_one(PromptInput)
+        prompt_input.display = True
+
+    def _execute_cascade(self, scope: CascadeScope, dependent_files: list[str]) -> None:
+        """Execute cascade updates based on the selected scope.
+
+        Args:
+            scope: The scope of files to update.
+            dependent_files: List of dependent files that could be updated.
+
+        Note:
+            Actual cascade execution (calling sub-agents) requires Stage 9's
+            delegation tools. For now, this shows a hint about what would happen.
+        """
+        if scope == CascadeScope.NONE:
+            return
+
+        # Determine which files will be updated based on scope
+        files_to_update: list[str] = []
+        if scope == CascadeScope.ALL:
+            files_to_update = dependent_files
+        elif scope == CascadeScope.PLAN_ONLY:
+            files_to_update = [f for f in dependent_files if "plan.md" in f]
+        elif scope == CascadeScope.TASKS_ONLY:
+            files_to_update = [f for f in dependent_files if "tasks.md" in f]
+
+        if files_to_update:
+            file_names = ", ".join(f.split("/")[-1] for f in files_to_update)
+            # TODO: Stage 9 will implement actual delegation to sub-agents
+            self.mount_hint(f"📋 Cascade update queued for: {file_names}")
+
+        self.widget_coordinator.update_prompt_input(focus=True)
+
+    def _check_pending_cascade(self) -> None:
+        """Check if there's a pending cascade and post CascadeConfirmationRequired if so.
+
+        This is called after each agent run to check if a file modification
+        set a pending cascade in Planning mode.
+        """
+        if not isinstance(self.deps, RouterDeps):
+            return
+
+        if self.deps.pending_cascade is None:
+            return
+
+        # Extract cascade data and clear the pending state
+        cascade = self.deps.pending_cascade
+        self.deps.pending_cascade = None
+
+        # Post the CascadeConfirmationRequired message to trigger the cascade UI
+        self.post_message(
+            CascadeConfirmationRequired(
+                updated_file=cascade.updated_file,
+                dependent_files=cascade.dependent_files,
+            )
+        )
+
+    # =========================================================================
+    # Plan Approval Handlers (Planning Mode - Stage 7)
+    # =========================================================================
+
+    @on(PlanApprovalRequired)
+    def handle_plan_approval_required(self, event: PlanApprovalRequired) -> None:
+        """Show approval widget when a multi-step plan is created.
+
+        In Planning mode, after creating a plan with multiple steps,
+        this shows the PlanApprovalWidget to let the user decide
+        whether to proceed or clarify.
+        """
+        logger.debug(
+            "[PLAN] handle_plan_approval_required - plan=%s",
+            f"'{event.plan.goal}' with {len(event.plan.steps)} steps",
+        )
+        if not isinstance(self.deps, RouterDeps):
+            logger.debug("[PLAN] Not RouterDeps, skipping approval widget")
+            return
+        if self.deps.router_mode != RouterMode.PLANNING:
+            logger.debug(
+                "[PLAN] Not in PLANNING mode (%s), skipping approval widget",
+                self.deps.router_mode,
+            )
+            return
+
+        # Show approval widget
+        logger.debug("[PLAN] Showing approval widget")
+        self._show_approval_widget(event.plan)
+
+    @on(PlanApproved)
+    def handle_plan_approved(self) -> None:
+        """Begin plan execution when user approves."""
+        self._hide_approval_widget()
+
+        if isinstance(self.deps, RouterDeps):
+            self.deps.approval_status = PlanApprovalStatus.APPROVED
+            self.deps.is_executing = True
+
+            # Switch to Drafting mode when plan is approved
+            self.deps.router_mode = RouterMode.DRAFTING
+            self._save_router_mode(RouterMode.DRAFTING.value)
+            self.widget_coordinator.update_for_mode_change(self.mode)
+
+            # Begin execution of the first step
+            plan = self.deps.current_plan
+            if plan and plan.current_step():
+                first_step = plan.current_step()
+                if first_step:
+                    self.run_agent(f"Execute step: {first_step.title}")
+            else:
+                self.widget_coordinator.update_prompt_input(focus=True)
+
+    @on(PlanRejected)
+    def handle_plan_rejected(self) -> None:
+        """Return to prompt input for clarification when user rejects plan."""
+        self._hide_approval_widget()
+
+        if isinstance(self.deps, RouterDeps):
+            self.deps.approval_status = PlanApprovalStatus.REJECTED
+            # Clear the plan since user wants to modify
+            self.deps.current_plan = None
+
+        self.mount_hint("ℹ️ Plan cancelled. Please clarify what you'd like to do.")
+        self.widget_coordinator.update_prompt_input(focus=True)
+
+    def _show_approval_widget(self, plan: ExecutionPlan) -> None:
+        """Replace PromptInput with PlanApprovalWidget.
+
+        Args:
+            plan: The execution plan that needs user approval.
+        """
+        # Create the approval widget
+        self._approval_widget = PlanApprovalWidget(plan)
+
+        # Hide PromptInput
+        prompt_input = self.query_one(PromptInput)
+        prompt_input.display = False
+
+        # Mount approval widget in footer
+        footer = self.query_one("#footer")
+        footer.mount(self._approval_widget, after=prompt_input)
+
+    def _hide_approval_widget(self) -> None:
+        """Remove approval widget, restore PromptInput."""
+        if self._approval_widget:
+            self._approval_widget.remove()
+            self._approval_widget = None
+
+        # Show PromptInput
+        prompt_input = self.query_one(PromptInput)
+        prompt_input.display = True
+
+    def _check_pending_approval(self) -> None:
+        """Check if there's a pending approval and post PlanApprovalRequired if so.
+
+        This is called after each agent run to check if create_plan
+        set a pending approval in Planning mode.
+        """
+        logger.debug("[PLAN] _check_pending_approval called")
+        if not isinstance(self.deps, RouterDeps):
+            logger.debug("[PLAN] Not RouterDeps, skipping pending approval check")
+            return
+
+        if self.deps.pending_approval is None:
+            logger.debug("[PLAN] No pending approval")
+            return
+
+        # Extract approval data and clear the pending state
+        approval = self.deps.pending_approval
+        self.deps.pending_approval = None
+
+        logger.debug(
+            "[PLAN] Found pending approval for plan: '%s' with %d steps",
+            approval.plan.goal,
+            len(approval.plan.steps),
+        )
+
+        # Post the PlanApprovalRequired message to trigger the approval UI
+        self.post_message(PlanApprovalRequired(plan=approval.plan))
+
+    # =========================================================================
+    # Plan Panel (Stage 11)
+    # =========================================================================
+
+    @on(PlanUpdated)
+    def handle_plan_updated(self, event: PlanUpdated) -> None:
+        """Auto-show/hide plan panel when plan changes.
+
+        The plan panel automatically shows when a plan is created or
+        modified, and hides when the plan is cleared.
+        """
+        if event.plan is not None:
+            # Show panel (auto-reopens when plan changes)
+            self._show_plan_panel(event.plan)
+        else:
+            # Plan cleared - hide panel
+            self._hide_plan_panel()
+
+    @on(PlanPanelClosed)
+    def handle_plan_panel_closed(self, event: PlanPanelClosed) -> None:
+        """Handle user closing the plan panel with × button."""
+        self._hide_plan_panel()
+
+    def _show_plan_panel(self, plan: ExecutionPlan) -> None:
+        """Show the plan panel with the given plan.
+
+        Args:
+            plan: The execution plan to display.
+        """
+        if self._plan_panel is None:
+            self._plan_panel = PlanPanelWidget(plan)
+            # Mount in window container, before footer
+            window = self.query_one("#window")
+            footer = self.query_one("#footer")
+            window.mount(self._plan_panel, before=footer)
+        else:
+            self._plan_panel.update_plan(plan)
+
+    def _hide_plan_panel(self) -> None:
+        """Hide the plan panel."""
+        if self._plan_panel:
+            self._plan_panel.remove()
+            self._plan_panel = None
+
+    def _on_plan_changed(self, plan: ExecutionPlan | None) -> None:
+        """Handle plan changes from router tools.
+
+        This callback is set on RouterDeps to receive plan updates
+        and post PlanUpdated messages to update the plan panel.
+
+        Args:
+            plan: The updated plan or None if plan was cleared.
+        """
+        logger.debug(
+            "[PLAN] _on_plan_changed called - plan=%s",
+            f"'{plan.goal}' with {len(plan.steps)} steps" if plan else "None",
+        )
+        self.post_message(PlanUpdated(plan))