shotgun-sh 0.1.13.dev1__py3-none-any.whl → 0.1.14.dev1__py3-none-any.whl

shotgun/agents/agent_manager.py

@@ -31,7 +31,6 @@ from pydantic_ai.messages import (
     SystemPromptPart,
     ToolCallPart,
     ToolCallPartDelta,
-    ToolReturnPart,
 )
 from textual.message import Message
 from textual.widget import Widget
@@ -273,8 +272,15 @@ class AgentManager(Widget):
         # Use merged deps (shared state + agent-specific system prompt) if not provided
         if deps is None:
             deps = self._create_merged_deps(self._current_agent_type)
-        if not deferred_tool_results:
-            self.ensure_agent_canecelled_safely()
+        ask_user_part = self.get_unanswered_ask_user_part()
+        if ask_user_part and prompt:
+            if not deferred_tool_results:
+                deferred_tool_results = DeferredToolResults()
+            deferred_tool_results.calls[ask_user_part.tool_call_id] = UserAnswer(
+                answer=prompt,
+                tool_call_id=ask_user_part.tool_call_id,
+            )
+            prompt = None
 
         # Ensure deps is not None
         if deps is None:
@@ -677,31 +683,21 @@ class AgentManager(Widget):
         self.ui_message_history.append(message)
         self._post_messages_updated()
 
-    def ensure_agent_canecelled_safely(self) -> None:
+    def get_unanswered_ask_user_part(self) -> ToolCallPart | None:
         if not self.message_history:
-            return
+            return None
         self.last_response = self.message_history[-1]
         ## we're searching for unanswered ask_user parts
-        found_tool = None
-        for part in self.message_history[-1].parts:
-            if isinstance(part, ToolCallPart) and part.tool_name == "ask_user":
-                found_tool = part
-                break
-        if not found_tool:
-            return
-        tool_result = ModelRequest(
-            parts=[
-                ToolReturnPart(
-                    tool_call_id=found_tool.tool_call_id,
-                    tool_name=found_tool.tool_name,
-                    content=UserAnswer(
-                        answer="⚠️ Operation cancelled by user",
-                        tool_call_id=found_tool.tool_call_id,
-                    ),
-                )
-            ]
+        found_tool = next(
+            (
+                part
+                for part in self.message_history[-1].parts
+                if isinstance(part, ToolCallPart) and part.tool_name == "ask_user"
+            ),
+            None,
         )
-        self.message_history.append(tool_result)
+
+        return found_tool
 
 
 # Re-export AgentType for backward compatibility

shotgun/tui/screens/chat.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import cast
 
-from pydantic_ai import DeferredToolResults, RunContext
+from pydantic_ai import RunContext
 from pydantic_ai.messages import (
     ModelMessage,
     ModelRequest,
@@ -37,7 +37,6 @@ from shotgun.agents.models import (
     AgentDeps,
     AgentType,
     FileOperationTracker,
-    UserAnswer,
     UserQuestion,
 )
 from shotgun.codebase.core.manager import CodebaseAlreadyIndexedError
@@ -712,7 +711,6 @@ class ChatScreen(Screen[None]):
 
     @work
     async def run_agent(self, message: str) -> None:
-        deferred_tool_results = None
         prompt = None
         self.working = True
 
@@ -721,32 +719,15 @@ class ChatScreen(Screen[None]):
 
         self._current_worker = get_current_worker()
 
-        if self.question:
-            # This is a response to a question from the agent
-            self.question.result.set_result(
-                UserAnswer(answer=message, tool_call_id=self.question.tool_call_id)
-            )
-
-            deferred_tool_results = DeferredToolResults()
-
-            deferred_tool_results.calls[self.question.tool_call_id] = UserAnswer(
-                answer=message, tool_call_id=self.question.tool_call_id
-            )
-
-            self.question = None
-        else:
-            # This is a new user prompt
-            prompt = message
+        prompt = message
 
         try:
             await self.agent_manager.run(
                 prompt=prompt,
-                deferred_tool_results=deferred_tool_results,
             )
         except asyncio.CancelledError:
             # Handle cancellation gracefully - DO NOT re-raise
             self.mount_hint("⚠️ Operation cancelled by user")
-            self.agent_manager.ensure_agent_canecelled_safely()
         finally:
             self.working = False
             self._current_worker = None

{shotgun_sh-0.1.13.dev1.dist-info → shotgun_sh-0.1.14.dev1.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ shotgun/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/sentry_telemetry.py,sha256=L7jFMNAnDIENWVeQYSLpyul2nmIm2w3wnOp2kDP_cic,2902
 shotgun/telemetry.py,sha256=Ves6Ih3hshpKVNVAUUmwRdtW8NkTjFPg8hEqvFKZ0t0,3208
 shotgun/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
-shotgun/agents/agent_manager.py,sha256=hmJlcOX98vLn5hYuzjC_cDGpDc89DMjCpQupK-Gq2WU,26393
+shotgun/agents/agent_manager.py,sha256=wXUQCEsSs68FG8edFLryeePBzxxX1GStJZwd1sS5WsE,26245
 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
@@ -110,7 +110,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=1XpiST6yIiFFGDN8VEQis9m4dWPvPdl7Bk_7avSsGUg,30928
+shotgun/tui/screens/chat.py,sha256=HIDnqt8og2KMmtdOok1lL44130M8V7IP6Un_8HcRwsA,30178
 shotgun/tui/screens/chat.tcss,sha256=2Yq3E23jxsySYsgZf4G1AYrYVcpX0UDW6kNNI0tDmtM,437
 shotgun/tui/screens/directory_setup.py,sha256=lIZ1J4A6g5Q2ZBX8epW7BhR96Dmdcg22CyiM5S-I5WU,3237
 shotgun/tui/screens/provider_config.py,sha256=A_tvDHF5KLP5PV60LjMJ_aoOdT3TjI6_g04UIUqGPqM,7126
@@ -126,8 +126,8 @@ shotgun/utils/env_utils.py,sha256=8QK5aw_f_V2AVTleQQlcL0RnD4sPJWXlDG46fsHu0d8,10
 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.1.13.dev1.dist-info/METADATA,sha256=ghoaqJH6WWZee1-qvat2Ac1RV9Ky6zvQkxJffBLvf_A,11197
-shotgun_sh-0.1.13.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.1.13.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.1.13.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.1.13.dev1.dist-info/RECORD,,
+shotgun_sh-0.1.14.dev1.dist-info/METADATA,sha256=3x81Mpn8f-zmc9tH8P_FVniZ7GqGV_SeH4nbDPqRIcU,11197
+shotgun_sh-0.1.14.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.1.14.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.1.14.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.1.14.dev1.dist-info/RECORD,,