shotgun-sh 0.2.17__py3-none-any.whl → 0.4.0.dev1__py3-none-any.whl

shotgun/tui/screens/chat_screen/messages.py

@@ -0,0 +1,219 @@
+"""Message types for ChatScreen communication.
+
+This module defines Textual message types used for communication
+between widgets and the ChatScreen, particularly for step checkpoints
+and cascade confirmation in the Router's Planning mode.
+"""
+
+from textual.message import Message
+
+from shotgun.agents.models import AgentType
+from shotgun.agents.router.models import CascadeScope, ExecutionPlan, ExecutionStep
+
+__all__ = [
+    # Step checkpoint messages (Stage 4)
+    "StepCompleted",
+    "CheckpointContinue",
+    "CheckpointModify",
+    "CheckpointStop",
+    # Cascade confirmation messages (Stage 5)
+    "CascadeConfirmationRequired",
+    "CascadeConfirmed",
+    "CascadeDeclined",
+    # Plan approval messages (Stage 7)
+    "PlanApprovalRequired",
+    "PlanApproved",
+    "PlanRejected",
+    # Sub-agent lifecycle messages (Stage 8)
+    "SubAgentStarted",
+    "SubAgentCompleted",
+    # Plan panel messages (Stage 11)
+    "PlanUpdated",
+    "PlanPanelClosed",
+]
+
+
+class StepCompleted(Message):
+    """Posted when a plan step completes in Planning mode.
+
+    This message triggers the checkpoint UI to appear, allowing the user
+    to choose whether to continue, modify the plan, or stop execution.
+
+    Attributes:
+        step: The step that was just completed.
+        next_step: The next step to execute, or None if this was the last step.
+    """
+
+    def __init__(self, step: ExecutionStep, next_step: ExecutionStep | None) -> None:
+        super().__init__()
+        self.step = step
+        self.next_step = next_step
+
+
+class CheckpointContinue(Message):
+    """Posted when user chooses to continue to next step.
+
+    This message indicates the user wants to proceed with the next
+    step in the execution plan.
+    """
+
+
+class CheckpointModify(Message):
+    """Posted when user wants to modify the plan.
+
+    This message indicates the user wants to return to the prompt input
+    to make adjustments to the plan before continuing.
+    """
+
+
+class CheckpointStop(Message):
+    """Posted when user wants to stop execution.
+
+    This message indicates the user wants to halt execution while
+    keeping the remaining steps in the plan as pending.
+    """
+
+
+# =============================================================================
+# Cascade Confirmation Messages (Stage 5)
+# =============================================================================
+
+
+class CascadeConfirmationRequired(Message):
+    """Posted when a file with dependents was modified and needs cascade confirmation.
+
+    In Planning mode, after modifying a file like specification.md that has
+    dependent files (plan.md, tasks.md), this message triggers the cascade
+    confirmation UI to appear.
+
+    Attributes:
+        updated_file: The file that was just updated (e.g., "specification.md").
+        dependent_files: List of files that depend on the updated file.
+    """
+
+    def __init__(self, updated_file: str, dependent_files: list[str]) -> None:
+        super().__init__()
+        self.updated_file = updated_file
+        self.dependent_files = dependent_files
+
+
+class CascadeConfirmed(Message):
+    """Posted when user confirms cascade update.
+
+    This message indicates the user wants to proceed with updating
+    dependent files based on the selected scope.
+
+    Attributes:
+        scope: The scope of files to update (ALL, PLAN_ONLY, TASKS_ONLY, NONE).
+    """
+
+    def __init__(self, scope: CascadeScope) -> None:
+        super().__init__()
+        self.scope = scope
+
+
+class CascadeDeclined(Message):
+    """Posted when user declines cascade update.
+
+    This message indicates the user does not want to update dependent
+    files and will handle them manually.
+    """
+
+
+# =============================================================================
+# Plan Approval Messages (Stage 7)
+# =============================================================================
+
+
+class PlanApprovalRequired(Message):
+    """Posted when a multi-step plan is created and needs user approval.
+
+    In Planning mode, after the router creates a plan with multiple steps,
+    this message triggers the approval UI to appear.
+
+    Attributes:
+        plan: The execution plan that needs user approval.
+    """
+
+    def __init__(self, plan: ExecutionPlan) -> None:
+        super().__init__()
+        self.plan = plan
+
+
+class PlanApproved(Message):
+    """Posted when user approves the plan.
+
+    This message indicates the user wants to proceed with executing
+    the plan ("Go Ahead").
+    """
+
+
+class PlanRejected(Message):
+    """Posted when user rejects the plan to clarify/modify.
+
+    This message indicates the user wants to return to the prompt input
+    to modify or clarify the request ("No, Let Me Clarify").
+    """
+
+
+# =============================================================================
+# Sub-Agent Lifecycle Messages (Stage 8)
+# =============================================================================
+
+
+class SubAgentStarted(Message):
+    """Posted when router starts delegating to a sub-agent.
+
+    This message triggers the mode indicator to show the active sub-agent
+    in the format "📋 Planning → Research".
+
+    Attributes:
+        agent_type: The type of sub-agent that started executing.
+    """
+
+    def __init__(self, agent_type: AgentType) -> None:
+        super().__init__()
+        self.agent_type = agent_type
+
+
+class SubAgentCompleted(Message):
+    """Posted when sub-agent delegation completes.
+
+    This message triggers the mode indicator to clear the sub-agent
+    display and return to showing just the mode.
+
+    Attributes:
+        agent_type: The type of sub-agent that completed.
+    """
+
+    def __init__(self, agent_type: AgentType) -> None:
+        super().__init__()
+        self.agent_type = agent_type
+
+
+# =============================================================================
+# Plan Panel Messages (Stage 11)
+# =============================================================================
+
+
+class PlanUpdated(Message):
+    """Posted when the current plan changes.
+
+    This message triggers the plan panel to auto-show/hide based on
+    whether a plan exists.
+
+    Attributes:
+        plan: The updated execution plan, or None if plan was cleared.
+    """
+
+    def __init__(self, plan: ExecutionPlan | None) -> None:
+        super().__init__()
+        self.plan = plan
+
+
+class PlanPanelClosed(Message):
+    """Posted when user closes the plan panel with × button.
+
+    This message indicates the user wants to dismiss the plan panel
+    temporarily. The panel will reopen when the plan changes.
+    """

shotgun/tui/screens/confirmation_dialog.py

@@ -5,9 +5,12 @@ from typing import Literal
 from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container
+from textual.events import Resize
 from textual.screen import ModalScreen
 from textual.widgets import Button, Label, Static
 
+from shotgun.tui.layout import COMPACT_HEIGHT_THRESHOLD
+
 ButtonVariant = Literal["default", "primary", "success", "warning", "error"]
 
 
@@ -87,6 +90,20 @@ class ConfirmationDialog(ModalScreen[bool]):
         #dialog-buttons Button {
             margin-left: 1;
         }
+
+        /* Compact styles for short terminals */
+        #dialog-container.compact {
+            padding: 0 2;
+            max-height: 98%;
+        }
+
+        #dialog-title.compact {
+            padding-bottom: 0;
+        }
+
+        #dialog-message.compact {
+            padding-bottom: 0;
+        }
     """
 
     def __init__(
@@ -138,6 +155,29 @@ class ConfirmationDialog(ModalScreen[bool]):
         # Focus cancel button by default for safety
         self.query_one("#cancel", Button).focus()
 
+        # Apply compact layout if starting in a short terminal
+        self._apply_compact_layout(self.app.size.height < COMPACT_HEIGHT_THRESHOLD)
+
+    @on(Resize)
+    def handle_resize(self, event: Resize) -> None:
+        """Adjust layout based on terminal height."""
+        self._apply_compact_layout(event.size.height < COMPACT_HEIGHT_THRESHOLD)
+
+    def _apply_compact_layout(self, compact: bool) -> None:
+        """Apply or remove compact layout classes for short terminals."""
+        container = self.query_one("#dialog-container")
+        title = self.query_one("#dialog-title")
+        message = self.query_one("#dialog-message")
+
+        if compact:
+            container.add_class("compact")
+            title.add_class("compact")
+            message.add_class("compact")
+        else:
+            container.remove_class("compact")
+            title.remove_class("compact")
+            message.remove_class("compact")
+
     @on(Button.Pressed, "#cancel")
     def handle_cancel(self, event: Button.Pressed) -> None:
         """Handle cancel button press."""

shotgun/tui/screens/directory_setup.py

@@ -1,4 +1,4 @@
-"""Screen for setting up the local .shotgun directory."""
+"""Screen for displaying .shotgun directory creation errors."""
 
 from __future__ import annotations
 
@@ -8,13 +8,20 @@ from textual import on
 from textual.app import ComposeResult
 from textual.containers import Horizontal, Vertical
 from textual.screen import Screen
-from textual.widgets import Button, Static
-
-from shotgun.utils.file_system_utils import ensure_shotgun_directory_exists
+from textual.widgets import Button, Label, Static
 
 
 class DirectorySetupScreen(Screen[None]):
-    """Prompt the user to initialize the .shotgun directory."""
+    """Display an error when .shotgun directory creation fails."""
+
+    def __init__(self, error_message: str) -> None:
+        """Initialize the error screen.
+
+        Args:
+            error_message: The error message to display to the user.
+        """
+        super().__init__()
+        self.error_message = error_message
 
     CSS = """
         DirectorySetupScreen {
@@ -56,58 +63,55 @@ class DirectorySetupScreen(Screen[None]):
         #directory-actions > * {
             margin-right: 2;
         }
+
+        #directory-status {
+            height: auto;
+            padding: 0 1;
+            min-height: 1;
+            color: $error;
+            text-align: center;
+        }
     """
 
     BINDINGS = [
-        ("enter", "confirm", "Initialize"),
+        ("enter", "retry", "Retry"),
         ("escape", "cancel", "Exit"),
     ]
 
     def compose(self) -> ComposeResult:
         with Vertical(id="titlebox"):
-            yield Static("Directory setup", id="directory-setup-title")
-            yield Static("Shotgun keeps workspace data in a .shotgun directory.\n")
-            yield Static("Initialize it in the current directory?\n")
-            yield Static(f"[$foreground-muted]({Path.cwd().resolve()})[/]")
-        with Horizontal(id="directory-actions"):
-            yield Button(
-                "Initialize and proceed \\[ENTER]", variant="primary", id="initialize"
+            yield Static(
+                "Failed to create .shotgun directory", id="directory-setup-title"
+            )
+            yield Static("Shotgun was unable to create the .shotgun directory in:\n")
+            yield Static(f"[$foreground-muted]({Path.cwd().resolve()})[/]\n")
+            yield Static(f"[bold red]Error:[/] {self.error_message}\n")
+            yield Static(
+                "This directory is required for storing workspace data. "
+                "Please check permissions and try again."
             )
-            yield Button("Exit without setup \\[ESC]", variant="default", id="exit")
+        yield Label("", id="directory-status")
+        with Horizontal(id="directory-actions"):
+            yield Button("Retry \\[ENTER]", variant="primary", id="retry")
+            yield Button("Exit \\[ESC]", variant="default", id="exit")
 
     def on_mount(self) -> None:
-        self.set_focus(self.query_one("#initialize", Button))
+        self.set_focus(self.query_one("#retry", Button))
 
-    def action_confirm(self) -> None:
-        self._initialize_directory()
+    def action_retry(self) -> None:
+        """Retry by dismissing the screen, which will trigger refresh_startup_screen."""
+        self.dismiss()
 
     def action_cancel(self) -> None:
-        self._exit_application()
+        """Exit the application."""
+        self.app.exit()
 
-    @on(Button.Pressed, "#initialize")
-    def _on_initialize_pressed(self) -> None:
-        self._initialize_directory()
+    @on(Button.Pressed, "#retry")
+    def _on_retry_pressed(self) -> None:
+        """Retry by dismissing the screen."""
+        self.dismiss()
 
     @on(Button.Pressed, "#exit")
     def _on_exit_pressed(self) -> None:
-        self._exit_application()
-
-    def _initialize_directory(self) -> None:
-        try:
-            path = ensure_shotgun_directory_exists()
-        except Exception as exc:  # pragma: no cover - defensive; textual path
-            self.notify(f"Failed to initialize directory: {exc}", severity="error")
-            return
-
-        # Double-check a directory now exists; guard against unexpected filesystem state.
-        if not path.is_dir():
-            self.notify(
-                "Unable to initialize .shotgun directory due to filesystem conflict.",
-                severity="error",
-            )
-            return
-
-        self.dismiss()
-
-    def _exit_application(self) -> None:
+        """Exit the application."""
         self.app.exit()

shotgun/tui/screens/feedback.py

@@ -76,6 +76,13 @@ class FeedbackScreen(Screen[Feedback | None]):
         #feedback-type-list {
             padding: 1;
         }
+
+        #feedback-status {
+            height: auto;
+            padding: 0 1;
+            min-height: 1;
+            color: $error;
+        }
     """
 
     BINDINGS = [
@@ -96,6 +103,7 @@ class FeedbackScreen(Screen[Feedback | None]):
             "",
             id="feedback-description",
         )
+        yield Label("", id="feedback-status")
         with Horizontal(id="feedback-actions"):
             yield Button("Submit", variant="primary", id="submit")
             yield Button("Cancel \\[ESC]", id="cancel")
@@ -176,9 +184,8 @@ class FeedbackScreen(Screen[Feedback | None]):
         description = text_area.text.strip()
 
         if not description:
-            self.notify(
-                "Please enter a description before submitting.", severity="error"
-            )
+            status_label = self.query_one("#feedback-status", Label)
+            status_label.update("❌ Please enter a description before submitting.")
             return
 
         app = cast("ShotgunApp", self.app)

shotgun/tui/screens/github_issue.py

@@ -6,7 +6,7 @@ from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Vertical
 from textual.screen import ModalScreen
-from textual.widgets import Button, Markdown, Static
+from textual.widgets import Button, Label, Markdown, Static
 
 
 class GitHubIssueScreen(ModalScreen[None]):
@@ -47,6 +47,13 @@ class GitHubIssueScreen(ModalScreen[None]):
             margin: 1 1;
             min-width: 20;
         }
+
+        #issue-status {
+            height: auto;
+            padding: 1;
+            min-height: 1;
+            text-align: center;
+        }
     """
 
     BINDINGS = [
@@ -85,6 +92,7 @@ We review all issues and will respond as soon as possible!
                     id="issue-markdown",
                 )
             with Vertical(id="issue-buttons"):
+                yield Label("", id="issue-status")
                 yield Button(
                     "🐙 Open GitHub Issues", id="github-button", variant="primary"
                 )
@@ -94,7 +102,8 @@ We review all issues and will respond as soon as possible!
     def handle_github(self) -> None:
         """Open GitHub issues page in browser."""
         webbrowser.open("https://github.com/shotgun-sh/shotgun/issues")
-        self.notify("Opening GitHub Issues in your browser...")
+        status_label = self.query_one("#issue-status", Label)
+        status_label.update("✓ Opening GitHub Issues in your browser...")
 
     @on(Button.Pressed, "#close-button")
     def handle_close(self) -> None:

shotgun/tui/screens/model_picker.py

@@ -72,6 +72,11 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
             padding: 1 0;
             }
         }
+        #model-picker-status {
+            height: auto;
+            padding: 0 1;
+            color: $error;
+        }
         #model-actions {
             padding: 1;
         }
@@ -84,7 +89,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
         ("escape", "done", "Back"),
     ]
 
-    selected_model: reactive[ModelName] = reactive(ModelName.GPT_5)
+    selected_model: reactive[ModelName] = reactive(ModelName.GPT_5_1)
 
     def compose(self) -> ComposeResult:
         with Vertical(id="titlebox"):
@@ -94,6 +99,7 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 id="model-picker-summary",
             )
         yield ListView(id="model-list")
+        yield Label("", id="model-picker-status")
         with Horizontal(id="model-actions"):
             yield Button("Select \\[ENTER]", variant="primary", id="select")
             yield Button("Done \\[ESC]", id="done")
@@ -287,6 +293,12 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
         )
         return has_key
 
+    def _format_tokens(self, tokens: int) -> str:
+        """Format token count for display (K for thousands, M for millions)."""
+        if tokens >= 1_000_000:
+            return f"{tokens / 1_000_000:.1f}M"
+        return f"{tokens // 1000}K"
+
     def _model_label(self, model_name: ModelName, is_current: bool) -> str:
         """Generate label for model with specs and current indicator."""
         if model_name not in MODEL_SPECS:
@@ -296,13 +308,13 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
         display_name = self._model_display_name(model_name)
 
         # Format context/output tokens in readable format
-        input_k = spec.max_input_tokens // 1000
-        output_k = spec.max_output_tokens // 1000
+        input_fmt = self._format_tokens(spec.max_input_tokens)
+        output_fmt = self._format_tokens(spec.max_output_tokens)
 
-        label = f"{display_name} · {input_k}K context · {output_k}K output"
+        label = f"{display_name} · {input_fmt} context · {output_fmt} output"
 
         # Add cost indicator for expensive models
-        if model_name == ModelName.CLAUDE_OPUS_4_1:
+        if model_name == ModelName.CLAUDE_OPUS_4_5:
             label += " · Expensive"
 
         if is_current:
@@ -313,10 +325,17 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
     def _model_display_name(self, model_name: ModelName) -> str:
         """Get human-readable model name."""
         names = {
-            ModelName.GPT_5: "GPT-5 (OpenAI)",
-            ModelName.CLAUDE_OPUS_4_1: "Claude Opus 4.1 (Anthropic)",
+            ModelName.GPT_5_1: "GPT-5.1 (OpenAI)",
+            ModelName.GPT_5_1_CODEX: "GPT-5.1 Codex (OpenAI)",
+            ModelName.GPT_5_1_CODEX_MINI: "GPT-5.1 Codex Mini (OpenAI)",
+            ModelName.CLAUDE_OPUS_4_5: "Claude Opus 4.5 (Anthropic)",
+            ModelName.CLAUDE_SONNET_4: "Claude Sonnet 4 (Anthropic)",
             ModelName.CLAUDE_SONNET_4_5: "Claude Sonnet 4.5 (Anthropic)",
+            ModelName.CLAUDE_HAIKU_4_5: "Claude Haiku 4.5 (Anthropic)",
             ModelName.GEMINI_2_5_PRO: "Gemini 2.5 Pro (Google)",
+            ModelName.GEMINI_2_5_FLASH: "Gemini 2.5 Flash (Google)",
+            ModelName.GEMINI_2_5_FLASH_LITE: "Gemini 2.5 Flash Lite (Google)",
+            ModelName.GEMINI_3_PRO_PREVIEW: "Gemini 3 Pro Preview (Google)",
         }
         return names.get(model_name, model_name.value)
 
@@ -349,4 +368,5 @@ class ModelPickerScreen(Screen[ModelConfigUpdated | None]):
                 )
             )
         except Exception as exc:  # pragma: no cover - defensive; textual path
-            self.notify(f"Failed to select model: {exc}", severity="error")
+            status_label = self.query_one("#model-picker-status", Label)
+            status_label.update(f"❌ Failed to select model: {exc}")