shotgun-sh 0.2.5.dev1__py3-none-any.whl → 0.2.6.dev2__py3-none-any.whl

shotgun/agents/agent_manager.py

@@ -36,6 +36,7 @@ from textual.message import Message
 from textual.widget import Widget
 
 from shotgun.agents.common import add_system_prompt_message, add_system_status_message
+from shotgun.agents.config.models import KeyProvider
 from shotgun.agents.models import AgentType, FileOperation
 from shotgun.posthog_telemetry import track_event
 from shotgun.tui.screens.chat_screen.hint_message import HintMessage
@@ -359,10 +360,18 @@ class AgentManager(Widget):
         model_name = ""
         if hasattr(deps, "llm_model") and deps.llm_model is not None:
             model_name = deps.llm_model.name
-        is_gpt5 = (  # streaming is likely not supported for gpt5. It varies between keys.
-            "gpt-5" in model_name.lower()
+
+        # Check if it's a Shotgun account
+        is_shotgun_account = (
+            hasattr(deps, "llm_model")
+            and deps.llm_model is not None
+            and deps.llm_model.key_provider == KeyProvider.SHOTGUN
         )
 
+        # Only disable streaming for GPT-5 if NOT a Shotgun account
+        # Shotgun accounts support streaming for GPT-5
+        is_gpt5_byok = "gpt-5" in model_name.lower() and not is_shotgun_account
+
         # Track message send event
         event_name = f"message_send_{self._current_agent_type.value}"
         track_event(
@@ -383,7 +392,9 @@ class AgentManager(Widget):
                 usage_limits=usage_limits,
                 message_history=message_history,
                 deferred_tool_results=deferred_tool_results,
-                event_stream_handler=self._handle_event_stream if not is_gpt5 else None,
+                event_stream_handler=self._handle_event_stream
+                if not is_gpt5_byok
+                else None,
                 **kwargs,
             )
         finally:
@@ -695,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/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/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/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/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/agents/tools/{user_interaction.py → 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/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().
@@ -20,6 +20,7 @@ Your extensive expertise spans, among other things:
 9. **Be Creative**: If the user seems not to know something, always be creative and come up with ideas that fit their thinking.
 10. Greet the user when you're just starting to work.
 11. DO NOT repeat yourself.
+12. If a user has agreed to a plan, you DO NOT NEED TO FOLLOW UP with them after every step to ask "is this search query ok?".
 
 
 ## Quality Standards

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/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,
                 )
@@ -215,8 +215,18 @@ class AgentResponseWidget(Widget):
         acc = ""
         if self.item is None:
             return ""
+
+        # Check if there's an ask_user tool call
+        has_ask_user = any(
+            isinstance(part, ToolCallPart) and part.tool_name == "ask_user"
+            for part in self.item.parts
+        )
+
         for idx, part in enumerate(self.item.parts):
             if isinstance(part, TextPart):
+                # Skip ALL text parts if there's an ask_user tool call
+                if has_ask_user:
+                    continue
                 # Only show the circle prefix if there's actual content
                 if part.content and part.content.strip():
                     acc += f"**⏺** {part.content}\n\n"
@@ -224,7 +234,25 @@ class AgentResponseWidget(Widget):
                 parts_str = self._format_tool_call_part(part)
                 acc += parts_str + "\n\n"
             elif isinstance(part, BuiltinToolCallPart):
-                acc += f"{part.tool_name}({part.args})\n\n"
+                # Format builtin tool calls better
+                if part.tool_name and "search" in part.tool_name.lower():
+                    args = self._parse_args(part.args)
+                    if isinstance(args, dict) and "query" in args:
+                        query = self._truncate(str(args.get("query", "")))
+                        acc += f'Searching: "{query}"\n\n'
+                    else:
+                        acc += f"{part.tool_name}()\n\n"
+                else:
+                    # For other builtin tools, show name only or with truncated args
+                    if part.args:
+                        args_str = (
+                            str(part.args)[:50] + "..."
+                            if len(str(part.args)) > 50
+                            else str(part.args)
+                        )
+                        acc += f"{part.tool_name}({args_str})\n\n"
+                    else:
+                        acc += f"{part.tool_name}()\n\n"
             elif isinstance(part, BuiltinToolReturnPart):
                 acc += f"builtin tool ({part.tool_name}) return: {part.content}\n\n"
             elif isinstance(part, ThinkingPart):
@@ -261,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)
 
@@ -305,12 +336,16 @@ class AgentResponseWidget(Widget):
                 return f'Reading file: "{args["filename"]}"'
             return "Reading file"
 
-        # Web search tools
-        if part.tool_name in [
-            "openai_web_search_tool",
-            "anthropic_web_search_tool",
-            "gemini_web_search_tool",
-        ]:
+        # Web search tools - handle variations
+        if (
+            part.tool_name
+            in [
+                "openai_web_search_tool",
+                "anthropic_web_search_tool",
+                "gemini_web_search_tool",
+            ]
+            or "search" in part.tool_name.lower()
+        ):  # Catch other search variations
             if "query" in args:
                 query = self._truncate(str(args["query"]))
                 return f'Searching web: "{query}"'
@@ -332,7 +367,24 @@ class AgentResponseWidget(Widget):
                 return f"{part.tool_name}({args['name']})"
             return f"▪ {part.tool_name}()"
 
-        return f"{part.tool_name}({part.args})"
+        # Default case for unrecognized tools - format args properly
+        args = self._parse_args(part.args)
+        if args and isinstance(args, dict):
+            # Try to extract common fields
+            if "query" in args:
+                return f'{part.tool_name}: "{self._truncate(str(args["query"]))}"'
+            elif "question" in args:
+                return f'{part.tool_name}: "{self._truncate(str(args["question"]))}"'
+            else:
+                # Show tool name with truncated args
+                args_str = (
+                    str(part.args)[:50] + "..."
+                    if len(str(part.args)) > 50
+                    else str(part.args)
+                )
+                return f"{part.tool_name}({args_str})"
+        else:
+            return f"{part.tool_name}()"
 
     def _format_ask_user_part(
         self,
@@ -350,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 ""

{shotgun_sh-0.2.5.dev1.dist-info → shotgun_sh-0.2.6.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.5.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.5.dev1.dist-info → shotgun_sh-0.2.6.dev2.dist-info}/RECORD

@@ -8,14 +8,14 @@ shotgun/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/sentry_telemetry.py,sha256=VD8es-tREfgtRKhDsEVvqpo0_kM_ab6iVm2lkOEmTlI,2950
 shotgun/telemetry.py,sha256=WfxdHALh5_51nw783ZZvD-LEyC6ypHxSUTMXUioZhTQ,3339
 shotgun/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
-shotgun/agents/agent_manager.py,sha256=xq8L0oAFgtFCpKVsyUoMtYJqUyz5XxjWLKNnxoe1zo4,26577
-shotgun/agents/common.py,sha256=BINebrcS9BcHu7yDH2yxTjChCmQoUCUrmUMlRnz4_JY,19265
+shotgun/agents/agent_manager.py,sha256=3Ww9PyYtRCdi84-u8O9cV5zyHC_Np4R1HiJ2JZbA4hY,27013
+shotgun/agents/common.py,sha256=PAcVimooOhB4j8iCQkAgs72gGEIJELbT3HoF7UH-ESs,19456
 shotgun/agents/conversation_history.py,sha256=5J8_1yxdZiiWTq22aDio88DkBDZ4_Lh_p5Iy5_ENszc,3898
 shotgun/agents/conversation_manager.py,sha256=fxAvXbEl3Cl2ugJ4N9aWXaqZtkrnfj3QzwjWC4LFXwI,3514
 shotgun/agents/export.py,sha256=Zke952DbJ_lOBUmN-TPHw7qmjbfqsFu1uycBRQI_pkg,2969
 shotgun/agents/llm.py,sha256=hs8j1wwTczGtehzahL1Z_5D4qus5QUx4-h9-m5ZPzm4,2209
 shotgun/agents/messages.py,sha256=wNn0qC5AqASM8LMaSGFOerZEJPn5FsIOmaJs1bdosuU,1036
-shotgun/agents/models.py,sha256=IvwwjbJYi5wi9S-budg8g1ezi1VaO57Q-XtegkbTrXg,8096
+shotgun/agents/models.py,sha256=Dg6ZTYxdwuTEZjfMATORoyWImMNRkXWS1Ec6o2m1kXI,8842
 shotgun/agents/plan.py,sha256=s-WfILBOW4l8kY59RUOVtX5MJSuSzFm1nGp6b17If78,3030
 shotgun/agents/research.py,sha256=lYG7Rytcitop8mXs3isMI3XvYzzI3JH9u0VZz6K9zfo,3274
 shotgun/agents/specify.py,sha256=7MoMxfIn34G27mw6wrp_F0i2O5rid476L3kHFONDCd0,3137
@@ -41,9 +41,10 @@ shotgun/agents/history/token_counting/openai.py,sha256=XJ2z2HaUG6f3Cw9tCK_yaOsaM
 shotgun/agents/history/token_counting/sentencepiece_counter.py,sha256=qj1bT7J5nCd5y6Mr42O9K1KTaele0rjdd09FeyyEA70,3987
 shotgun/agents/history/token_counting/tokenizer_cache.py,sha256=Y0V6KMtEwn42M5-zJGAc7YudM8X6m5-j2ekA6YGL5Xk,2868
 shotgun/agents/history/token_counting/utils.py,sha256=d124IDjtd0IYBYrr3gDJGWxSbdP10Vrc7ZistbUosMg,5002
-shotgun/agents/tools/__init__.py,sha256=QaN80IqWvB5qEcjHqri1-PYvYlO74vdhcwLugoEdblo,772
+shotgun/agents/tools/__init__.py,sha256=O1re6tyVIXDI2Jbuakb33njJeJoNMXHiwsmJxWjbNqo,826
+shotgun/agents/tools/ask_questions.py,sha256=527gRWt97I-MGknSDC3UHDMTVLlCEBAqV22tglFI-xo,2193
+shotgun/agents/tools/ask_user.py,sha256=u_5s3SwnIhmfk5IIRBmqUA7TspvDeDya_pqoP2ACd3I,1227
 shotgun/agents/tools/file_management.py,sha256=HYNe_QA4T3_bPzSWBYcFZcnWdj8eb4aQ3GB735-G8Nw,7138
-shotgun/agents/tools/user_interaction.py,sha256=b3ncEpvoD06Cz4hwsS-ppVbQajQj640iWnVfA5WBjAA,1236
 shotgun/agents/tools/codebase/__init__.py,sha256=ceAGkK006NeOYaIJBLQsw7Q46sAyCRK9PYDs8feMQVw,661
 shotgun/agents/tools/codebase/codebase_shell.py,sha256=9b7ZStAVFprdGqp1O23ZgwkToMytlUdp_R4MhvmENhc,8584
 shotgun/agents/tools/codebase/directory_lister.py,sha256=eX5GKDSmbKggKDvjPpYMa2WPSGPYQAtUEZ4eN01T0t8,4703
@@ -94,7 +95,7 @@ shotgun/prompts/agents/research.j2,sha256=JBtjXaMVDRuNTt7-Ai8gUb2InfolfqCkQoEkn9
 shotgun/prompts/agents/specify.j2,sha256=AP7XrA3KE7GZsCvW4guASxZHBM2mnrMw3irdZ3RUOBs,2808
 shotgun/prompts/agents/tasks.j2,sha256=9gGCimCWVvpaQSxkAjt7WmIxFHXJY2FlmqhqomFxQTA,5949
 shotgun/prompts/agents/partials/codebase_understanding.j2,sha256=7WH-PVd-TRBFQUdOdKkwwn9hAUaJznFZMAGHhO7IGGU,5633
-shotgun/prompts/agents/partials/common_agent_system_prompt.j2,sha256=eFuc3z1pSJzQtPJfjMIDNHv5XX9lP6YVrmKcbbskJj8,1877
+shotgun/prompts/agents/partials/common_agent_system_prompt.j2,sha256=iWYWOboW7osxfUmC82W9vhyKYbylZjHGF70hr51IUos,2035
 shotgun/prompts/agents/partials/content_formatting.j2,sha256=MG0JB7SSp8YV5akDWpbs2f9DcdREIYqLp38NnoWLeQ0,1854
 shotgun/prompts/agents/partials/interactive_mode.j2,sha256=9sYPbyc46HXg3k1FT_LugIQvOyNDnMQwsMIgOgN-_aY,1100
 shotgun/prompts/agents/state/system_state.j2,sha256=RPweqBYmgWMiDuOjdEDl6NLgYU7HMaUGW1jBSnD5UzQ,1270
@@ -128,7 +129,7 @@ shotgun/tui/components/prompt_input.py,sha256=Ss-htqraHZAPaehGE4x86ij0veMjc4Ugad
 shotgun/tui/components/spinner.py,sha256=ovTDeaJ6FD6chZx_Aepia6R3UkPOVJ77EKHfRmn39MY,2427
 shotgun/tui/components/splash.py,sha256=vppy9vEIEvywuUKRXn2y11HwXSRkQZHLYoVjhDVdJeU,1267
 shotgun/tui/components/vertical_tail.py,sha256=kROwTaRjUwVB7H35dtmNcUVPQqNYvvfq7K2tXBKEb6c,638
-shotgun/tui/screens/chat.py,sha256=Yb5zWpWVmvtIFjO1jkhU6piJyGVc9XdTErNd6kUbjjw,30389
+shotgun/tui/screens/chat.py,sha256=ICDW3s-pkWvEzUC6YL3BLZcb2H8Dd5uzDtDWaqtZqms,33920
 shotgun/tui/screens/chat.tcss,sha256=2Yq3E23jxsySYsgZf4G1AYrYVcpX0UDW6kNNI0tDmtM,437
 shotgun/tui/screens/directory_setup.py,sha256=lIZ1J4A6g5Q2ZBX8epW7BhR96Dmdcg22CyiM5S-I5WU,3237
 shotgun/tui/screens/feedback.py,sha256=VxpW0PVxMp22ZvSfQkTtgixNrpEOlfWtekjqlVfYEjA,5708
@@ -140,7 +141,7 @@ shotgun/tui/screens/welcome.py,sha256=r-RjtzjMhAaA0XKgnYKdZOuE07bcBi223fleKEf-Fa
 shotgun/tui/screens/chat_screen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/tui/screens/chat_screen/command_providers.py,sha256=7Xnxd4k30bpLOMZSX32bcugU4IgpqU4Y8f6eHWKXd4o,12694
 shotgun/tui/screens/chat_screen/hint_message.py,sha256=WOpbk8q7qt7eOHTyyHvh_IQIaublVDeJGaLpsxEk9FA,933
-shotgun/tui/screens/chat_screen/history.py,sha256=Go859iEjw0s5aELKpF42MjLXy7UFQ52XnJMTIkV3aLo,12406
+shotgun/tui/screens/chat_screen/history.py,sha256=N_dUXA6KaX3O3Km2wXQWeAODIMIYUmYiwboP3lA-dns,14904
 shotgun/tui/utils/__init__.py,sha256=cFjDfoXTRBq29wgP7TGRWUu1eFfiIG-LLOzjIGfadgI,150
 shotgun/tui/utils/mode_progress.py,sha256=lseRRo7kMWLkBzI3cU5vqJmS2ZcCjyRYf9Zwtvc-v58,10931
 shotgun/utils/__init__.py,sha256=WinIEp9oL2iMrWaDkXz2QX4nYVPAm8C9aBSKTeEwLtE,198
@@ -149,8 +150,8 @@ shotgun/utils/env_utils.py,sha256=ulM3BRi9ZhS7uC-zorGeDQm4SHvsyFuuU9BtVPqdrHY,14
 shotgun/utils/file_system_utils.py,sha256=l-0p1bEHF34OU19MahnRFdClHufThfGAjQ431teAIp0,1004
 shotgun/utils/source_detection.py,sha256=Co6Q03R3fT771TF3RzB-70stfjNP2S4F_ArZKibwzm8,454
 shotgun/utils/update_checker.py,sha256=IgzPHRhS1ETH7PnJR_dIx6lxgr1qHpCkMTgzUxvGjhI,7586
-shotgun_sh-0.2.5.dev1.dist-info/METADATA,sha256=a7NtlC-7j0n4tJwtUOF49DcSZ4qWCL9IxV9GvsOLoFQ,11226
-shotgun_sh-0.2.5.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.5.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.5.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.5.dev1.dist-info/RECORD,,
+shotgun_sh-0.2.6.dev2.dist-info/METADATA,sha256=bgbHWiHo8sV8ypBzgCq8SxOfYfg19-uETwVRMRWcGnY,11226
+shotgun_sh-0.2.6.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.6.dev2.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.6.dev2.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.6.dev2.dist-info/RECORD,,