shotgun-sh 0.2.8.dev3__tar.gz → 0.2.8.dev4__tar.gz

{shotgun_sh-0.2.8.dev3 → shotgun_sh-0.2.8.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.8.dev3
+Version: 0.2.8.dev4
 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.8.dev3 → shotgun_sh-0.2.8.dev4}/pyproject.toml

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

{shotgun_sh-0.2.8.dev3 → shotgun_sh-0.2.8.dev4}/src/shotgun/agents/agent_manager.py

@@ -40,6 +40,7 @@ from pydantic_ai.messages import (
     SystemPromptPart,
     ToolCallPart,
     ToolCallPartDelta,
+    UserPromptPart,
 )
 from textual.message import Message
 from textual.widget import Widget
@@ -554,11 +555,35 @@ class AgentManager(Widget):
             },
         )
 
-        # Always add the agent's response messages to maintain conversation history
-        self.ui_message_history = original_messages + cast(
+        # Merge agent's response messages, avoiding duplicates
+        # The TUI may have already added the user prompt, so check for it
+        new_messages = cast(
             list[ModelRequest | ModelResponse | HintMessage], result.new_messages()
         )
 
+        # Deduplicate: skip user prompts that are already in original_messages
+        deduplicated_new_messages = []
+        for msg in new_messages:
+            # Check if this is a user prompt that's already in original_messages
+            if isinstance(msg, ModelRequest) and any(
+                isinstance(part, UserPromptPart) for part in msg.parts
+            ):
+                # Check if an identical user prompt is already in original_messages
+                already_exists = any(
+                    isinstance(existing, ModelRequest)
+                    and any(isinstance(p, UserPromptPart) for p in existing.parts)
+                    and existing.parts == msg.parts
+                    for existing in original_messages[
+                        -5:
+                    ]  # Check last 5 messages for efficiency
+                )
+                if already_exists:
+                    continue  # Skip this duplicate user prompt
+
+            deduplicated_new_messages.append(msg)
+
+        self.ui_message_history = original_messages + deduplicated_new_messages
+
         # Get file operations early so we can use them for contextual messages
         file_operations = deps.file_tracker.operations.copy()
         self.recently_change_files = file_operations

{shotgun_sh-0.2.8.dev3 → shotgun_sh-0.2.8.dev4}/src/shotgun/tui/screens/chat.py

@@ -690,6 +690,12 @@ class ChatScreen(Screen[None]):
         # Not a command, process as normal
         self.history.append(message.text)
 
+        # Add user message to agent_manager's history BEFORE running the agent
+        # This ensures immediate visual feedback AND proper deduplication
+        user_message = ModelRequest.user_text_prompt(text)
+        self.agent_manager.ui_message_history.append(user_message)
+        self.messages = self.agent_manager.ui_message_history.copy()
+
         # Clear the input
         self.value = ""
         self.run_agent(text)  # Use stripped text