shotgun-sh 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

shotgun/agents/agent_manager.py

@@ -277,6 +277,8 @@ class AgentManager(Widget):
 
         # Clear file tracker before each run to track only this run's operations
         deps.file_tracker.clear()
+        # preprocess messages; maybe we need to include the user answer in the message history
+
         original_messages = self.ui_message_history.copy()
 
         if prompt:
@@ -477,11 +479,6 @@ class AgentManager(Widget):
                 elif isinstance(event, FunctionToolResultEvent):
                     request_message = ModelRequest(parts=[event.result])
                     state.messages.append(request_message)
-                    if (
-                        event.result.tool_name == "ask_user"
-                    ):  # special handling to ask_user, because deferred tool results mean we missed the user response
-                        self.ui_message_history.append(request_message)
-                        self._post_messages_updated()
                     ## this is what the user responded with
                     self._post_partial_message(is_last=False)
 

shotgun/tui/screens/chat_screen/history.py

@@ -1,5 +1,5 @@
 import json
-from collections.abc import Sequence
+from collections.abc import Generator, Sequence
 
 from pydantic_ai.messages import (
     BuiltinToolCallPart,
@@ -19,6 +19,7 @@ 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
 
@@ -86,7 +87,7 @@ class ChatHistory(Widget):
         self.vertical_tail = VerticalTail()
 
         with self.vertical_tail:
-            for item in self.items:
+            for item in self.filtered_items():
                 if isinstance(item, ModelRequest):
                     yield UserQuestionWidget(item)
                 elif isinstance(item, HintMessage):
@@ -98,6 +99,44 @@ class ChatHistory(Widget):
             )
         self.call_later(self.autoscroll)
 
+    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
+
     def update_messages(self, messages: list[ModelMessage | HintMessage]) -> None:
         """Update the displayed messages without recomposing."""
         if not self.vertical_tail:
@@ -133,8 +172,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" and isinstance(part.content, dict):
-                    acc += f"**>** {part.content['answer']}\n\n"
+                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

{shotgun_sh-0.1.9.dist-info → shotgun_sh-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.1.9
+Version: 0.1.10
 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.1.9.dist-info → shotgun_sh-0.1.10.dist-info}/RECORD

@@ -7,7 +7,7 @@ shotgun/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/sentry_telemetry.py,sha256=0W0o810ewFpIcdPsi_q4uKLiaP6zDYRRE5MHpIbQIPo,2954
 shotgun/telemetry.py,sha256=Ves6Ih3hshpKVNVAUUmwRdtW8NkTjFPg8hEqvFKZ0t0,3208
 shotgun/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
-shotgun/agents/agent_manager.py,sha256=xw9xNEwVU-P4NGqF8W6mzVw4HNqtSfegAN9atog7aEo,23813
+shotgun/agents/agent_manager.py,sha256=xSyra7R8s8RP2N0Oh1fYlwu46EB16npRNckzKGY-rGg,23578
 shotgun/agents/common.py,sha256=vt7ECq1rT6GR5Rt63t0whH0R0cydrk7Mty2KyPL8mEg,19045
 shotgun/agents/conversation_history.py,sha256=5J8_1yxdZiiWTq22aDio88DkBDZ4_Lh_p5Iy5_ENszc,3898
 shotgun/agents/conversation_manager.py,sha256=fxAvXbEl3Cl2ugJ4N9aWXaqZtkrnfj3QzwjWC4LFXwI,3514
@@ -117,15 +117,15 @@ shotgun/tui/screens/splash.py,sha256=E2MsJihi3c9NY1L28o_MstDxGwrCnnV7zdq00MrGAsw
 shotgun/tui/screens/chat_screen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/tui/screens/chat_screen/command_providers.py,sha256=55JIH9T8QnyHRsMoXhOi87FiVM-d6o7OKpCe82uDP9I,7840
 shotgun/tui/screens/chat_screen/hint_message.py,sha256=WOpbk8q7qt7eOHTyyHvh_IQIaublVDeJGaLpsxEk9FA,933
-shotgun/tui/screens/chat_screen/history.py,sha256=JjQOKjCZpLBcw9CMorkBjOt2U5Ikr81hEQRtQmhw_KM,7459
+shotgun/tui/screens/chat_screen/history.py,sha256=pmgtvPDcY4dyxLyMH0RrVmf8qBouW1hM99VSUn7XGPQ,8950
 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
 shotgun/utils/env_utils.py,sha256=8QK5aw_f_V2AVTleQQlcL0RnD4sPJWXlDG46fsHu0d8,1057
 shotgun/utils/file_system_utils.py,sha256=l-0p1bEHF34OU19MahnRFdClHufThfGAjQ431teAIp0,1004
 shotgun/utils/update_checker.py,sha256=TorvPRLtTVVNrTdKFZCfhrz9CQfkJZa4Mi9vQgsppvM,7698
-shotgun_sh-0.1.9.dist-info/METADATA,sha256=YIhhJFDkWJlANPFrZqI2-MbLnOj8Z1daZulls9TfsZE,11191
-shotgun_sh-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.1.9.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.1.9.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.1.9.dist-info/RECORD,,
+shotgun_sh-0.1.10.dist-info/METADATA,sha256=7GJ-Ybz0uPRHDpT1H-niARSd3YaBJXPwcU7X9YpCZVk,11192
+shotgun_sh-0.1.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.1.10.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.1.10.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.1.10.dist-info/RECORD,,