shotgun-sh 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

shotgun/tui/screens/chat_screen/history.py

@@ -19,7 +19,6 @@ from textual.reactive import reactive
 from textual.widget import Widget
 from textual.widgets import Markdown
 
-from shotgun.agents.models import UserAnswer
 from shotgun.tui.components.vertical_tail import VerticalTail
 from shotgun.tui.screens.chat_screen.hint_message import HintMessage, HintMessageWidget
 
@@ -103,42 +102,8 @@ class ChatHistory(Widget):
         self._rendered_count = len(filtered)
 
     def filtered_items(self) -> Generator[ModelMessage | HintMessage, None, None]:
-        for idx, next_item in enumerate(self.items):
-            prev_item = self.items[idx - 1] if idx > 0 else None
-
-            if isinstance(prev_item, ModelRequest) and isinstance(
-                next_item, ModelResponse
-            ):
-                ask_user_tool_response_part = next(
-                    (
-                        part
-                        for part in prev_item.parts
-                        if isinstance(part, ToolReturnPart)
-                        and part.tool_name == "ask_user"
-                    ),
-                    None,
-                )
-
-                ask_user_part = next(
-                    (
-                        part
-                        for part in next_item.parts
-                        if isinstance(part, ToolCallPart)
-                        and part.tool_name == "ask_user"
-                    ),
-                    None,
-                )
-
-                if not ask_user_part or not ask_user_tool_response_part:
-                    yield next_item
-                    continue
-                if (
-                    ask_user_tool_response_part.tool_call_id
-                    == ask_user_part.tool_call_id
-                ):
-                    continue  # don't emit tool call that happens after tool response
-
-            yield next_item
+        # Simply yield all items - no filtering needed now that ask_user/ask_questions are gone
+        yield from self.items
 
     def update_messages(self, messages: list[ModelMessage | HintMessage]) -> None:
         """Update the displayed messages using incremental mounting."""
@@ -167,6 +132,9 @@ class ChatHistory(Widget):
 
             self._rendered_count = len(filtered)
 
+            # Scroll to bottom to show newly added messages
+            self.vertical_tail.scroll_end(animate=False)
+
 
 class UserQuestionWidget(Widget):
     def __init__(self, item: ModelRequest | None) -> None:
@@ -189,13 +157,8 @@ class UserQuestionWidget(Widget):
                     f"**>** {part.content if isinstance(part.content, str) else ''}\n\n"
                 )
             elif isinstance(part, ToolReturnPart):
-                if part.tool_name == "ask_user":
-                    acc += f"**>** {part.content.answer if isinstance(part.content, UserAnswer) else part.content['answer']}\n\n"
-                else:
-                    # acc += "  ∟ finished\n\n"  # let's not show anything yet
-                    pass
-            elif isinstance(part, UserPromptPart):
-                acc += f"**>** {part.content}\n\n"
+                # Don't show tool return parts in the UI
+                pass
         return acc
 
 
@@ -215,6 +178,7 @@ class AgentResponseWidget(Widget):
         acc = ""
         if self.item is None:
             return ""
+
         for idx, part in enumerate(self.item.parts):
             if isinstance(part, TextPart):
                 # Only show the circle prefix if there's actual content
@@ -222,9 +186,28 @@ class AgentResponseWidget(Widget):
                     acc += f"**⏺** {part.content}\n\n"
             elif isinstance(part, ToolCallPart):
                 parts_str = self._format_tool_call_part(part)
-                acc += parts_str + "\n\n"
+                if parts_str:  # Only add if there's actual content
+                    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):
@@ -258,9 +241,6 @@ class AgentResponseWidget(Widget):
         return args if isinstance(args, dict) else {}
 
     def _format_tool_call_part(self, part: ToolCallPart) -> str:
-        if part.tool_name == "ask_user":
-            return self._format_ask_user_part(part)
-
         # Parse args once (handles both JSON string and dict)
         args = self._parse_args(part.args)
 
@@ -305,12 +285,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}"'
@@ -327,26 +311,25 @@ class AgentResponseWidget(Widget):
                 return f"{part.tool_name}({args['section_title']})"
             return f"{part.tool_name}()"
 
-        if part.tool_name == "create_artifact":
-            if "name" in args:
-                return f"{part.tool_name}({args['name']})"
-            return f"▪ {part.tool_name}()"
-
-        return f"{part.tool_name}({part.args})"
-
-    def _format_ask_user_part(
-        self,
-        part: ToolCallPart,
-    ) -> str:
-        if isinstance(part.args, str):
-            try:
-                _args = json.loads(part.args) if part.args.strip() else {}
-            except json.JSONDecodeError:
-                _args = {}
-        else:
-            _args = part.args
+        if part.tool_name == "final_result":
+            # Hide final_result tool calls completely - they're internal Pydantic AI mechanics
+            return ""
 
-        if isinstance(_args, dict) and "question" in _args:
-            return f"{_args['question']}"
+        # 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 "❓ "
+            return f"{part.tool_name}()"

shotgun/tui/screens/welcome.py

@@ -152,6 +152,10 @@ class WelcomeScreen(Screen[None]):
     @on(Button.Pressed, "#byok-button")
     def _on_byok_pressed(self) -> None:
         """Handle BYOK button press."""
+        self.run_worker(self._start_byok_config(), exclusive=True)
+
+    async def _start_byok_config(self) -> None:
+        """Launch BYOK provider configuration flow."""
         self._mark_welcome_shown()
 
         app = cast("ShotgunApp", self.app)
@@ -161,10 +165,14 @@ class WelcomeScreen(Screen[None]):
             self.dismiss()
             return
 
-        # Otherwise, push provider config screen
+        # Otherwise, push provider config screen and wait for result
         from .provider_config import ProviderConfigScreen
 
-        self.app.push_screen(ProviderConfigScreen())
+        await self.app.push_screen_wait(ProviderConfigScreen())
+
+        # Dismiss welcome screen after config if providers are now configured
+        if app.config_manager.has_any_provider_key():
+            self.dismiss()
 
     async def _start_shotgun_auth(self) -> None:
         """Launch Shotgun Account authentication flow."""

shotgun_sh-0.2.6.dist-info/METADATA

@@ -0,0 +1,125 @@
+Metadata-Version: 2.4
+Name: shotgun-sh
+Version: 0.2.6
+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
+Project-URL: Issues, https://github.com/shotgun-sh/shotgun-alpha/issues
+Project-URL: Discord, https://discord.gg/5RmY6J2N7s
+Author-email: "Proofs.io" <hello@proofs.io>
+License: MIT
+License-File: LICENSE
+Keywords: agent,ai,cli,llm,planning,productivity,pydantic-ai,research,task-management
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Utilities
+Requires-Python: >=3.11
+Requires-Dist: anthropic>=0.39.0
+Requires-Dist: genai-prices>=0.0.27
+Requires-Dist: httpx>=0.27.0
+Requires-Dist: jinja2>=3.1.0
+Requires-Dist: kuzu>=0.7.0
+Requires-Dist: logfire[pydantic-ai]>=2.0.0
+Requires-Dist: openai>=1.0.0
+Requires-Dist: packaging>=23.0
+Requires-Dist: posthog>=3.0.0
+Requires-Dist: pydantic-ai>=0.0.14
+Requires-Dist: rich>=13.0.0
+Requires-Dist: sentencepiece>=0.2.0
+Requires-Dist: sentry-sdk[pure-eval]>=2.0.0
+Requires-Dist: textual-dev>=1.7.0
+Requires-Dist: textual>=6.1.0
+Requires-Dist: tiktoken>=0.7.0
+Requires-Dist: tree-sitter-go>=0.23.0
+Requires-Dist: tree-sitter-javascript>=0.23.0
+Requires-Dist: tree-sitter-python>=0.23.0
+Requires-Dist: tree-sitter-rust>=0.23.0
+Requires-Dist: tree-sitter-typescript>=0.23.0
+Requires-Dist: tree-sitter>=0.21.0
+Requires-Dist: typer>=0.12.0
+Requires-Dist: watchdog>=4.0.0
+Provides-Extra: dev
+Requires-Dist: commitizen>=3.13.0; extra == 'dev'
+Requires-Dist: lefthook>=1.12.0; extra == 'dev'
+Requires-Dist: mypy>=1.11.0; extra == 'dev'
+Requires-Dist: ruff>=0.6.0; extra == 'dev'
+Description-Content-Type: text/markdown
+
+# Shotgun
+
+**Spec-Driven Development for AI Code Generation**
+
+Shotgun is a CLI tool that turns work with AI code-gen tools from "I want to build X" into: **research → specs → plans → tasks → implementation**. It reads your entire codebase, coordinates AI agents to do the heavy lifting, and exports clean artifacts in the agents.md format so your code-gen tools actually know what they're building.
+
+🌐 **Learn more at [shotgun.sh](https://shotgun.sh/)**
+
+## Features
+
+### 📊 Complete Codebase Understanding
+
+Before writing a single line, Shotgun reads all of it. Your patterns. Your dependencies. Your technical debt. Whether you're adding features, onboarding devs, planning migrations, or refactoring - Shotgun knows what you're working with.
+
+### 🔄 Five Modes. One Journey. Zero Gaps.
+
+**Research** (what exists) → **Specify** (what to build) → **Plan** (how to build) → **Tasks** (break it down) → **Export** (to any tool)
+
+Not another chatbot. A complete workflow where each mode feeds the next.
+
+### ➡️ Export to agents.md
+
+Outputs plug into many code-generation tools including Codex, Cursor, Warp, Devin, opencode, Jules, and more.
+
+### 📝 Specs That Don't Die in Slack
+
+Every research finding, every architectural decision, every "here's why we didn't use that library" - captured as markdown in your repo. Version controlled. Searchable.
+
+## Installation
+
+### Using pipx (Recommended)
+
+```bash
+pipx install shotgun-sh
+```
+
+**Why pipx?** It installs Shotgun in an isolated environment, preventing dependency conflicts with your other Python projects.
+
+### Using pip
+
+```bash
+pip install shotgun-sh
+```
+
+## Quick Start
+
+```bash
+# Research your codebase or a topic
+shotgun research "What is our authentication flow?"
+
+# Generate specifications
+shotgun spec "Add OAuth2 authentication"
+
+# Create an implementation plan
+shotgun plan "Build user dashboard"
+
+# Break down into tasks
+shotgun tasks "Implement payment system"
+
+# Export to agents.md format for your code-gen tools
+shotgun export
+```
+
+## Support
+
+Have questions? Join our community on **[Discord](https://discord.gg/5RmY6J2N7s)**
+
+---
+
+**License:** MIT
+**Python:** 3.11+

{shotgun_sh-0.2.5.dist-info → shotgun_sh-0.2.6.dist-info}/RECORD

@@ -6,24 +6,24 @@ shotgun/main.py,sha256=RA3q1xPfqxCu43UmgI2ryZpA-IxPhJb_MJrbLqp9c_g,5140
 shotgun/posthog_telemetry.py,sha256=TOiyBtLg21SttHGWKc4-e-PQgpbq6Uz_4OzlvlxMcZ0,6099
 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/telemetry.py,sha256=C8dM7Feo1OxJMwDvgAMaA2RyRDO2rYPvC_8kLBuRUS8,3683
 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=6f86XooirrBRxyfTWRwsJk6M_kKaaoAP4Yfi6Lu7zGc,28995
+shotgun/agents/common.py,sha256=g8QW782XZfZHjAJPC6k2uXqoX4UZufvbGaejzWgya8E,17768
 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/export.py,sha256=7ZNw7781WJ4peLSeoUc7zxKeaZVxFpow2y4nU4dCfbo,2919
 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/plan.py,sha256=s-WfILBOW4l8kY59RUOVtX5MJSuSzFm1nGp6b17If78,3030
-shotgun/agents/research.py,sha256=lYG7Rytcitop8mXs3isMI3XvYzzI3JH9u0VZz6K9zfo,3274
-shotgun/agents/specify.py,sha256=7MoMxfIn34G27mw6wrp_F0i2O5rid476L3kHFONDCd0,3137
-shotgun/agents/tasks.py,sha256=nk8zIl24o01hfzOGyWSbeVWeke6OGseO4Ppciurh13U,2999
+shotgun/agents/models.py,sha256=anNz8_U95B1__VPXgxFqfzk2BRIHrIO4clJlnfedVS8,9862
+shotgun/agents/plan.py,sha256=lVhIoRUMCX2TsFbwbgKjS2HHhNreX35j_aZRqGxFAso,2980
+shotgun/agents/research.py,sha256=EYqUda_wtrxmUNy6Mme3NFnO_uOXBCs94m2tZzheNOE,3224
+shotgun/agents/specify.py,sha256=38z0n_7pAgWN3oJFuOxfiEHWtEqzMha-SyPhhZ9pWag,3087
+shotgun/agents/tasks.py,sha256=AuriwtDn6uZz2G0eKfqBHYQrxYfJlbiAd-fcsw9lU3I,2949
 shotgun/agents/usage_manager.py,sha256=5d9JC4_cthXwhTSytMfMExMDAUYp8_nkPepTJZXk13w,5017
 shotgun/agents/config/__init__.py,sha256=Fl8K_81zBpm-OfOW27M_WWLSFdaHHek6lWz95iDREjQ,318
 shotgun/agents/config/constants.py,sha256=JNuLpeBUKikEsxGSjwX3RVWUQpbCKnDKstF2NczuDqk,932
-shotgun/agents/config/manager.py,sha256=AR3ENgt9zsJSyswOzc8XrnNIiMuq5hCbjU4n6S2ud4I,18699
+shotgun/agents/config/manager.py,sha256=WO3TOwXCSOa7e3s_rmvH74jGw7xTqA_OaGhNaUsZ0a4,18922
 shotgun/agents/config/models.py,sha256=ohLXt9niCy4uFfFP1E6WSBZtxh7aZ16gTA2S3pHYkmc,5431
 shotgun/agents/config/provider.py,sha256=K2uW7DkdAhZfoDJcWV7NxOrSoEq1rQzArtZnxIgEe3E,12496
 shotgun/agents/history/__init__.py,sha256=XFQj2a6fxDqVg0Q3juvN9RjV_RJbgvFZtQOCOjVJyp4,147
@@ -35,15 +35,14 @@ shotgun/agents/history/history_processors.py,sha256=D3z-hzrXHxE7OAZaVX4_YAKN_nyx
 shotgun/agents/history/message_utils.py,sha256=aPusAl2RYKbjc7lBxPaNprRHmZEG6fe97q7DQUlhlzU,2918
 shotgun/agents/history/token_estimation.py,sha256=iRyKq-YDivEpJrULIbQgNpjhOuSC4nHVJYfsWEFV8sQ,4770
 shotgun/agents/history/token_counting/__init__.py,sha256=YZt5Lus--fkF6l1hdkIlp1e_oAIpACNwHOI0FRP4q8s,924
-shotgun/agents/history/token_counting/anthropic.py,sha256=fdRmm91od814mH1fSCv0WxmivEOy8xmcDIXJum1JaiE,3146
+shotgun/agents/history/token_counting/anthropic.py,sha256=0Nf4mR7yjDbGyy8WguHse-sOENyU4X4CkthPjzbBaog,4031
 shotgun/agents/history/token_counting/base.py,sha256=TN4mzwSyWNQyTuOuCFaU-8AgLdAyquoX3af4qrmkxCs,1904
 shotgun/agents/history/token_counting/openai.py,sha256=XJ2z2HaUG6f3Cw9tCK_yaOsaMJGHpSFF1I30-d3soSI,2350
 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=kYppd4f4MoJcfTEPzkY2rqtxL1suXRGa9IRUm1G82GY,717
 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
@@ -88,15 +87,15 @@ shotgun/llm_proxy/constants.py,sha256=_4piKdyvM7pAIRdAGrzYexwWoDlueUZiEMfwWrOa4T
 shotgun/prompts/__init__.py,sha256=RswUm0HMdfm2m2YKUwUsEdRIwoczdbI7zlucoEvHYRo,132
 shotgun/prompts/loader.py,sha256=_7CdUYrAo6ZwvTBUlXugKyLU0IDBg5CVzUIAHFPw418,4433
 shotgun/prompts/agents/__init__.py,sha256=YRIJMbzpArojNX1BP5gfxxois334z_GQga8T-xyWMbY,39
-shotgun/prompts/agents/export.j2,sha256=GKpOfGbZA9PVa4TNtMORUYiBIAcN6JCo8URmTCWKlWw,15936
-shotgun/prompts/agents/plan.j2,sha256=MyZDyOS21V-zrHNzbIhIdzcESGh_3KVbA4qh9rZR2_E,6086
-shotgun/prompts/agents/research.j2,sha256=JBtjXaMVDRuNTt7-Ai8gUb2InfolfqCkQoEkn9PsQZk,3929
+shotgun/prompts/agents/export.j2,sha256=DGqVijH1PkpkY0rDauU52u_fMv15frEvOdXAPFZNMM4,17057
+shotgun/prompts/agents/plan.j2,sha256=mbt505NdqmzmPxXzQYJS_gH5vkiVa2a3Dgz2K-15JZk,6093
+shotgun/prompts/agents/research.j2,sha256=QFoSSiF_5v7c78RHaiucZEb9mOC_wF54BVKnJEH_DnI,3964
 shotgun/prompts/agents/specify.j2,sha256=AP7XrA3KE7GZsCvW4guASxZHBM2mnrMw3irdZ3RUOBs,2808
-shotgun/prompts/agents/tasks.j2,sha256=9gGCimCWVvpaQSxkAjt7WmIxFHXJY2FlmqhqomFxQTA,5949
+shotgun/prompts/agents/tasks.j2,sha256=SMvTQPzRR6eHlW3fcj-7Bl-Lh9HWaiF3uAKv77nMdZw,5956
 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=wfjsQGcMTWWGBk9l0pKDnPehG8NrwTHm5FFEqba__LI,2161
 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/partials/interactive_mode.j2,sha256=nyNTURRszG_Pl7M3TS_luUshekDn9yVHfBDMkHSZ1kw,1448
 shotgun/prompts/agents/state/system_state.j2,sha256=RPweqBYmgWMiDuOjdEDl6NLgYU7HMaUGW1jBSnD5UzQ,1270
 shotgun/prompts/agents/state/codebase/codebase_graphs_available.j2,sha256=U-hy-H9bPwV0sYIHTZ5TESxc5EOCtntI8GUZOmJipJw,601
 shotgun/prompts/codebase/__init__.py,sha256=NYuPMtmYM2ptuwf3YxVuotNlJOUq0hnjmwlzKcJkGK4,42
@@ -128,7 +127,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=78GaZMKN2iE7bQQwiKBWFTsRoraWnuWl91qPjo5q1Nw,35446
 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
@@ -136,11 +135,11 @@ shotgun/tui/screens/model_picker.py,sha256=G-EvalpxgHKk0W3FgHMcxIr817VwZyEgh_Zad
 shotgun/tui/screens/provider_config.py,sha256=UCnAzjXPoP7Y73gsXxZF2PNA4LdSgpgoGYwiOd6fERA,10902
 shotgun/tui/screens/shotgun_auth.py,sha256=Y--7LZewV6gfDkucxymfAO7BCd7eI2C3H1ClDMztVio,10663
 shotgun/tui/screens/splash.py,sha256=E2MsJihi3c9NY1L28o_MstDxGwrCnnV7zdq00MrGAsw,706
-shotgun/tui/screens/welcome.py,sha256=r-RjtzjMhAaA0XKgnYKdZOuE07bcBi223fleKEf-Faw,5772
+shotgun/tui/screens/welcome.py,sha256=XOKhd3hjhEUBjs9ZlUIZDdmrlIAvQ7qdO1_KKruGcqo,6134
 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=Bv7t1bcCf66X2qNEgwGMpPzNcxy4QZC4USshbctmJzA,12274
 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 +148,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.dist-info/METADATA,sha256=EFOMTry3j-nndQQf5YRJ5RCXxZkAoisYUSNCn1rCEZw,11221
-shotgun_sh-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.5.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.5.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.5.dist-info/RECORD,,
+shotgun_sh-0.2.6.dist-info/METADATA,sha256=PO0g-sqj_WTIr6dppso3IXwgk6wur5tJaP7TcSvEJAw,4263
+shotgun_sh-0.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.6.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.6.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.6.dist-info/RECORD,,

shotgun/agents/tools/user_interaction.py

@@ -1,37 +0,0 @@
-"""User interaction tools for Pydantic AI agents."""
-
-from asyncio import get_running_loop
-
-from pydantic_ai import CallDeferred, RunContext
-
-from shotgun.agents.models import AgentDeps, UserQuestion
-from shotgun.logging_config import get_logger
-
-logger = get_logger(__name__)
-
-
-async def ask_user(ctx: RunContext[AgentDeps], question: str) -> str:
-    """Ask the human a question and return the answer.
-
-
-    Args:
-        question: The question to ask the user with a clear CTA at the end. Needs to be is readable, clear, and easy to understand. Use Markdown formatting. Make key phrases and words stand out.
-
-    Returns:
-        The user's response as a string
-    """
-    tool_call_id = ctx.tool_call_id
-    assert tool_call_id is not None  # noqa: S101
-
-    try:
-        logger.debug("\n👉 %s\n", question)
-        future = get_running_loop().create_future()
-        await ctx.deps.queue.put(
-            UserQuestion(question=question, tool_call_id=tool_call_id, result=future)
-        )
-        ctx.deps.tasks.append(future)
-        raise CallDeferred(question)
-
-    except (EOFError, KeyboardInterrupt):
-        logger.warning("User input interrupted or unavailable")
-        return "User input not available or interrupted"