shotgun-sh 0.2.6.dev1__tar.gz → 0.2.6.dev2__tar.gz

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.6.dev1
+Version: 0.2.6.dev2
 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.2.6.dev1 → shotgun_sh-0.2.6.dev2}/pyproject.toml

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

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/agents/agent_manager.py

@@ -706,12 +706,13 @@ class AgentManager(Widget):
         if not self.message_history:
             return None
         self.last_response = self.message_history[-1]
-        ## we're searching for unanswered ask_user parts
+        ## we're searching for unanswered ask_user or ask_questions parts
         found_tool = next(
             (
                 part
                 for part in self.message_history[-1].parts
-                if isinstance(part, ToolCallPart) and part.tool_name == "ask_user"
+                if isinstance(part, ToolCallPart)
+                and part.tool_name in ("ask_user", "ask_questions")
             ),
             None,
         )

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/agents/common.py

@@ -33,6 +33,7 @@ from .messages import AgentSystemPrompt, SystemStatusPrompt
 from .models import AgentDeps, AgentRuntimeOptions, PipelineConfigEntry
 from .tools import (
     append_file,
+    ask_questions,
     ask_user,
     codebase_shell,
     directory_lister,
@@ -179,10 +180,13 @@ def create_base_agent(
     for tool in additional_tools or []:
         agent.tool_plain(tool)
 
-    # Register interactive tool conditionally based on deps
+    # Register interactive tools conditionally based on deps
     if deps.interactive_mode:
         agent.tool(ask_user)
-        logger.debug("📞 Interactive mode enabled - ask_user tool registered")
+        agent.tool(ask_questions)
+        logger.debug(
+            "📞 Interactive mode enabled - ask_user and ask_questions tools registered"
+        )
 
     # Register common file management tools (always available)
     agent.tool(write_file)
@@ -323,7 +327,9 @@ def extract_markdown_toc(agent_mode: AgentType | None) -> str | None:
         if prior_toc:
             # Add section with XML tags
             toc_sections.append(
-                f'<TABLE_OF_CONTENTS file_name="{prior_file}">\n{prior_toc}\n</TABLE_OF_CONTENTS>'
+                f'<TABLE_OF_CONTENTS file_name="{prior_file}">\n'
+                f"{prior_toc}\n"
+                f"</TABLE_OF_CONTENTS>"
             )
 
     # Extract TOC from own file (full detail)
@@ -334,7 +340,9 @@ def extract_markdown_toc(agent_mode: AgentType | None) -> str | None:
             # Put own file TOC at the beginning with XML tags
             toc_sections.insert(
                 0,
-                f'<TABLE_OF_CONTENTS file_name="{config.own_file}">\n{own_toc}\n</TABLE_OF_CONTENTS>',
+                f'<TABLE_OF_CONTENTS file_name="{config.own_file}">\n'
+                f"{own_toc}\n"
+                f"</TABLE_OF_CONTENTS>",
             )
 
     # Combine all sections
@@ -476,7 +484,8 @@ async def add_system_prompt_message(
     message_history = message_history or []
 
     # Create a minimal RunContext to call the system prompt function
-    # We'll pass None for model and usage since they're not used by our system prompt functions
+    # We'll pass None for model and usage since they're not used
+    # by our system prompt functions
     context = type(
         "RunContext", (), {"deps": deps, "retry": 0, "model": None, "usage": None}
     )()
@@ -544,7 +553,8 @@ async def run_agent(
             message_history=messages,
             deferred_tool_results=results,
         )
-        # Apply persistent compaction to prevent cascading token growth in multi-turn loops
+        # Apply persistent compaction to prevent cascading token growth
+        # in multi-turn loops
         messages = await apply_persistent_compaction(result.all_messages(), deps)
 
     # Log file operations summary if any files were modified

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/agents/models.py

@@ -73,6 +73,30 @@ class UserQuestion(BaseModel):
     )
 
 
+class MultipleUserQuestions(BaseModel):
+    """Multiple questions to ask the user sequentially."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    questions: list[str] = Field(
+        description="List of questions to ask the user",
+    )
+    current_index: int = Field(
+        default=0,
+        description="Current question index being asked",
+    )
+    answers: list[str] = Field(
+        default_factory=list,
+        description="Accumulated answers from the user",
+    )
+    tool_call_id: str = Field(
+        description="Tool call id",
+    )
+    result: Future[UserAnswer] = Field(
+        description="Future that will contain all answers formatted as Q&A pairs"
+    )
+
+
 class AgentRuntimeOptions(BaseModel):
     """User interface options for agents."""
 
@@ -100,9 +124,9 @@ class AgentRuntimeOptions(BaseModel):
         description="Maximum number of iterations for agent loops",
     )
 
-    queue: Queue[UserQuestion] = Field(
+    queue: Queue[UserQuestion | MultipleUserQuestions] = Field(
         default_factory=Queue,
-        description="Queue for storing user responses",
+        description="Queue for storing user questions (single or multiple)",
     )
 
     tasks: list[Future[UserAnswer]] = Field(

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/agents/tools/__init__.py

@@ -1,5 +1,7 @@
 """Tools package for Pydantic AI agents."""
 
+from .ask_questions import ask_questions
+from .ask_user import ask_user
 from .codebase import (
     codebase_shell,
     directory_lister,
@@ -8,7 +10,6 @@ from .codebase import (
     retrieve_code,
 )
 from .file_management import append_file, read_file, write_file
-from .user_interaction import ask_user
 from .web_search import (
     anthropic_web_search_tool,
     gemini_web_search_tool,
@@ -22,6 +23,7 @@ __all__ = [
     "gemini_web_search_tool",
     "get_available_web_search_tools",
     "ask_user",
+    "ask_questions",
     "read_file",
     "write_file",
     "append_file",

shotgun_sh-0.2.6.dev2/src/shotgun/agents/tools/ask_questions.py

@@ -0,0 +1,55 @@
+"""Ask multiple questions tool for Pydantic AI agents."""
+
+from asyncio import get_running_loop
+
+from pydantic_ai import CallDeferred, RunContext
+
+from shotgun.agents.models import AgentDeps, MultipleUserQuestions
+from shotgun.logging_config import get_logger
+
+logger = get_logger(__name__)
+
+
+async def ask_questions(ctx: RunContext[AgentDeps], questions: list[str]) -> str:
+    """Ask the human multiple questions sequentially and return all Q&A pairs.
+
+    This tool will display questions one at a time with progress indicators
+    (e.g., "Question 1 of 5") and collect all answers before returning them
+    formatted together. This provides a better UX than asking questions one by one,
+    as users can see their progress and don't need to use multiline input.
+
+    Do not ask 1 question with multiple parts, or multiple questions inside of it.
+    Structure it so each question can be answered independently.
+
+    Args:
+        questions: List of questions to ask the user. Each question should be readable,
+            clear, and easy to understand. Use Markdown formatting. Make key phrases
+            and words stand out. Questions will be asked in the order provided.
+
+    Returns:
+        All questions and answers formatted as:
+        "Q1: {question1}\\nA1: {answer1}\\n\\nQ2: {question2}\\nA2: {answer2}\\n\\n..."
+    """
+    tool_call_id = ctx.tool_call_id
+    assert tool_call_id is not None  # noqa: S101
+
+    try:
+        logger.debug("\n👉 Asking %d questions\n", len(questions))
+        future = get_running_loop().create_future()
+        await ctx.deps.queue.put(
+            MultipleUserQuestions(
+                questions=questions,
+                tool_call_id=tool_call_id,
+                result=future,
+            )
+        )
+        ctx.deps.tasks.append(future)
+        # Use first question as deferred message preview
+        preview = questions[0] if questions else "No questions"
+        raise CallDeferred(
+            f"Asking {len(questions)} questions starting with: {preview}"
+        )
+
+    except (EOFError, KeyboardInterrupt):
+        logger.warning("User input interrupted or unavailable")
+        return "User input not available or interrupted"

shotgun_sh-0.2.6.dev1/src/shotgun/agents/tools/user_interaction.py → shotgun_sh-0.2.6.dev2/src/shotgun/agents/tools/ask_user.py

@@ -1,4 +1,4 @@
-"""User interaction tools for Pydantic AI agents."""
+"""Ask user tool for Pydantic AI agents."""
 
 from asyncio import get_running_loop
 

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/prompts/agents/partials/common_agent_system_prompt.j2

@@ -7,7 +7,7 @@ Your extensive expertise spans, among other things:
 ## KEY RULES
 
 {% if interactive_mode %}
-0. Always ask CLARIFYING QUESTIONS if the user's request is ambiguous or lacks sufficient detail. Do not make assumptions about what the user wants.
+0. Always ask CLARIFYING QUESTIONS using the ask_questions() tool if the user's request is ambiguous or lacks sufficient detail. Do not make assumptions about what the user wants.
 {% endif %}
 1. Above all, prefer using tools to do the work and NEVER respond with text.
 2. IMPORTANT: Always ask for review and go ahead to move forward after using write_file().

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/tui/screens/chat.py

@@ -20,7 +20,7 @@ from textual.keys import Keys
 from textual.reactive import reactive
 from textual.screen import ModalScreen, Screen
 from textual.widget import Widget
-from textual.widgets import Button, Label, Markdown, Static
+from textual.widgets import Button, Label, Static
 
 from shotgun.agents.agent_manager import (
     AgentManager,
@@ -37,6 +37,7 @@ from shotgun.agents.models import (
     AgentDeps,
     AgentType,
     FileOperationTracker,
+    MultipleUserQuestions,
     UserQuestion,
 )
 from shotgun.codebase.core.manager import CodebaseAlreadyIndexedError
@@ -114,9 +115,18 @@ class StatusBar(Widget):
 
     def render(self) -> str:
         if self.working:
-            return """[$foreground-muted][bold $text]esc[/] to stop • [bold $text]enter[/] to send • [bold $text]ctrl+j[/] for newline • [bold $text]ctrl+p[/] command palette • [bold $text]shift+tab[/] cycle modes • /help for commands[/]"""
+            return (
+                "[$foreground-muted][bold $text]esc[/] to stop • "
+                "[bold $text]enter[/] to send • [bold $text]ctrl+j[/] for newline • "
+                "[bold $text]ctrl+p[/] command palette • [bold $text]shift+tab[/] cycle modes • "
+                "/help for commands[/]"
+            )
         else:
-            return """[$foreground-muted][bold $text]enter[/] to send • [bold $text]ctrl+j[/] for newline • [bold $text]ctrl+p[/] command palette • [bold $text]shift+tab[/] cycle modes • /help for commands[/]"""
+            return (
+                "[$foreground-muted][bold $text]enter[/] to send • "
+                "[bold $text]ctrl+j[/] for newline • [bold $text]ctrl+p[/] command palette • "
+                "[bold $text]shift+tab[/] cycle modes • /help for commands[/]"
+            )
 
 
 class ModeIndicator(Widget):
@@ -149,10 +159,16 @@ class ModeIndicator(Widget):
             AgentType.EXPORT: "Export",
         }
         mode_description = {
-            AgentType.RESEARCH: "Research topics with web search and synthesize findings",
+            AgentType.RESEARCH: (
+                "Research topics with web search and synthesize findings"
+            ),
             AgentType.PLAN: "Create comprehensive, actionable plans with milestones",
-            AgentType.TASKS: "Generate specific, actionable tasks from research and plans",
-            AgentType.SPECIFY: "Create detailed specifications and requirements documents",
+            AgentType.TASKS: (
+                "Generate specific, actionable tasks from research and plans"
+            ),
+            AgentType.SPECIFY: (
+                "Create detailed specifications and requirements documents"
+            ),
             AgentType.EXPORT: "Export artifacts and findings to various formats",
         }
 
@@ -163,7 +179,10 @@ class ModeIndicator(Widget):
         has_content = self.progress_checker.has_mode_content(self.mode)
         status_icon = " ✓" if has_content else ""
 
-        return f"[bold $text-accent]{mode_title}{status_icon} mode[/][$foreground-muted] ({description})[/]"
+        return (
+            f"[bold $text-accent]{mode_title}{status_icon} mode[/]"
+            f"[$foreground-muted] ({description})[/]"
+        )
 
 
 class CodebaseIndexPromptScreen(ModalScreen[bool]):
@@ -199,7 +218,8 @@ class CodebaseIndexPromptScreen(ModalScreen[bool]):
             yield Static(
                 f"Would you like to index the codebase at:\n{Path.cwd()}\n\n"
                 "This is required for the agent to understand your code and answer "
-                "questions about it. Without indexing, the agent cannot analyze your codebase."
+                "questions about it. Without indexing, the agent cannot analyze "
+                "your codebase."
             )
             with Container(id="index-prompt-buttons"):
                 yield Button(
@@ -238,7 +258,7 @@ class ChatScreen(Screen[None]):
     history: PromptHistory = PromptHistory()
     messages = reactive(list[ModelMessage | HintMessage]())
     working = reactive(False)
-    question: reactive[UserQuestion | None] = reactive(None)
+    question: reactive[UserQuestion | MultipleUserQuestions | None] = reactive(None)
     indexing_job: reactive[CodebaseIndexSelection | None] = reactive(None)
     partial_message: reactive[ModelMessage | None] = reactive(None)
     _current_worker = None  # Track the current running worker for cancellation
@@ -378,17 +398,6 @@ class ChatScreen(Screen[None]):
             chat_history = self.query_one(ChatHistory)
             chat_history.update_messages(messages)
 
-    def watch_question(self, question: UserQuestion | None) -> None:
-        """Update the question display."""
-        if self.is_mounted:
-            question_display = self.query_one("#question-display", Markdown)
-            if question:
-                question_display.update(f"Question:\n\n{question.question}")
-                question_display.display = True
-            else:
-                question_display.update("")
-                question_display.display = False
-
     def action_toggle_mode(self) -> None:
         modes = [
             AgentType.RESEARCH,
@@ -414,8 +423,38 @@ class ChatScreen(Screen[None]):
     async def add_question_listener(self) -> None:
         while True:
             question = await self.deps.queue.get()
-            self.question = question
-            await question.result
+
+            if isinstance(question, MultipleUserQuestions):
+                # Set question state - handle_submit will add Q&A to chat
+                question.current_index = 0
+                self.question = question
+
+                # Show intro message with total question count
+                num_questions = len(question.questions)
+                self.agent_manager.add_hint_message(
+                    HintMessage(message=f"I'm going to ask {num_questions} questions:")
+                )
+
+                # Show all questions in a numbered list so users can see what's coming
+                if question.questions:
+                    questions_list = "\n".join(
+                        f"{i + 1}. {q}" for i, q in enumerate(question.questions)
+                    )
+                    self.agent_manager.add_hint_message(
+                        HintMessage(message=questions_list)
+                    )
+
+                    # Now show the first question prompt to indicate where to start answering
+                    first_q = question.questions[0]
+                    self.agent_manager.add_hint_message(
+                        HintMessage(message=f"**Q1:** {first_q}")
+                    )
+            else:
+                # Handle single question (original behavior)
+                self.question = question
+                await question.result
+                self.question = None
+
             self.deps.queue.task_done()
 
     def compose(self) -> ComposeResult:
@@ -423,7 +462,6 @@ class ChatScreen(Screen[None]):
         with Container(id="window"):
             yield self.agent_manager
             yield ChatHistory()
-            yield Markdown(markdown="", id="question-display")
             with Container(id="footer"):
                 yield Spinner(
                     text="Processing...",
@@ -510,6 +548,8 @@ class ChatScreen(Screen[None]):
 
     @on(PromptInput.Submitted)
     async def handle_submit(self, message: PromptInput.Submitted) -> None:
+        from shotgun.agents.models import UserAnswer
+
         text = message.text.strip()
 
         # If empty text, just clear input and return
@@ -519,6 +559,63 @@ class ChatScreen(Screen[None]):
             self.value = ""
             return
 
+        # Check if we're in a multi-question flow
+        if self.question and isinstance(self.question, MultipleUserQuestions):
+            q_num = self.question.current_index + 1
+
+            # Q1 already shown by handle_message_history_updated,
+            # Q2+ shown after previous answer. So we only need to add the answer to chat
+            self.agent_manager.add_hint_message(
+                HintMessage(message=f"**A{q_num}:** {text}")
+            )
+
+            # Store the answer
+            self.question.answers.append(text)
+
+            # Move to next question or finish
+            self.question.current_index += 1
+
+            if self.question.current_index < len(self.question.questions):
+                # Show the next question immediately after the answer
+                next_q = self.question.questions[self.question.current_index]
+                next_q_num = self.question.current_index + 1
+                self.agent_manager.add_hint_message(
+                    HintMessage(message=f"**Q{next_q_num}:** {next_q}")
+                )
+            else:
+                # All questions answered! Format and resolve
+                formatted_qa = "\n\n".join(
+                    f"Q{i + 1}: {q}\nA{i + 1}: {a}"
+                    for i, (q, a) in enumerate(
+                        zip(self.question.questions, self.question.answers, strict=True)
+                    )
+                )
+
+                # Resolve the original future with formatted Q&A (this goes to the agent)
+                final_answer = UserAnswer(
+                    answer=formatted_qa,
+                    tool_call_id=self.question.tool_call_id,
+                )
+                self.question.result.set_result(final_answer)
+
+                # Clear question state
+                self.question = None
+
+                # Clear input first
+                prompt_input = self.query_one(PromptInput)
+                prompt_input.clear()
+                self.value = ""
+
+                # Send the formatted Q&A directly to the agent (no prefix needed)
+                self.run_agent(formatted_qa)
+                return
+
+            # Clear input and return
+            prompt_input = self.query_one(PromptInput)
+            prompt_input.clear()
+            self.value = ""
+            return
+
         # Check if it's a command
         if self.command_handler.is_command(text):
             success, response = self.command_handler.handle_command(text)
@@ -785,7 +882,9 @@ class ChatScreen(Screen[None]):
 
 def help_text_with_codebase(already_indexed: bool = False) -> str:
     return (
-        "Howdy! Welcome to Shotgun - the context tool for software engineering. \n\nYou can research, build specs, plan, create tasks, and export context to your favorite code-gen agents.\n\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"
@@ -796,7 +895,9 @@ def help_text_with_codebase(already_indexed: bool = False) -> str:
 
 def help_text_empty_dir() -> str:
     return (
-        "Howdy! Welcome to Shotgun - the context tool for software engineering.\n\nYou can research, build specs, plan, create tasks, and export context to your favorite code-gen agents.\n\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"

{shotgun_sh-0.2.6.dev1 → shotgun_sh-0.2.6.dev2}/src/shotgun/tui/screens/chat_screen/history.py

@@ -114,7 +114,7 @@ class ChatHistory(Widget):
                         part
                         for part in prev_item.parts
                         if isinstance(part, ToolReturnPart)
-                        and part.tool_name == "ask_user"
+                        and part.tool_name in ("ask_user", "ask_questions")
                     ),
                     None,
                 )
@@ -124,7 +124,7 @@ class ChatHistory(Widget):
                         part
                         for part in next_item.parts
                         if isinstance(part, ToolCallPart)
-                        and part.tool_name == "ask_user"
+                        and part.tool_name in ("ask_user", "ask_questions")
                     ),
                     None,
                 )
@@ -289,6 +289,9 @@ class AgentResponseWidget(Widget):
         if part.tool_name == "ask_user":
             return self._format_ask_user_part(part)
 
+        if part.tool_name == "ask_questions":
+            return self._format_ask_questions_part(part)
+
         # Parse args once (handles both JSON string and dict)
         args = self._parse_args(part.args)
 
@@ -399,3 +402,10 @@ class AgentResponseWidget(Widget):
             return f"{_args['question']}"
         else:
             return "❓ "
+
+    def _format_ask_questions_part(
+        self,
+        part: ToolCallPart,
+    ) -> str:
+        """Hide ask_questions tool calls - Q&A shown as HintMessages instead."""
+        return ""