shotgun-sh 0.1.9__tar.gz → 0.1.10__tar.gz

{shotgun_sh-0.1.9 → shotgun_sh-0.1.10}/PKG-INFO

@@ -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 → shotgun_sh-0.1.10}/pyproject.toml

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

{shotgun_sh-0.1.9 → shotgun_sh-0.1.10}/src/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_sh-0.1.9 → shotgun_sh-0.1.10}/src/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