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

shotgun/agents/agent_manager.py

@@ -36,6 +36,7 @@ from textual.message import Message
 from textual.widget import Widget
 
 from shotgun.agents.common import add_system_prompt_message, add_system_status_message
+from shotgun.agents.config.models import KeyProvider
 from shotgun.agents.models import AgentType, FileOperation
 from shotgun.posthog_telemetry import track_event
 from shotgun.tui.screens.chat_screen.hint_message import HintMessage
@@ -359,10 +360,18 @@ class AgentManager(Widget):
         model_name = ""
         if hasattr(deps, "llm_model") and deps.llm_model is not None:
             model_name = deps.llm_model.name
-        is_gpt5 = (  # streaming is likely not supported for gpt5. It varies between keys.
-            "gpt-5" in model_name.lower()
+
+        # Check if it's a Shotgun account
+        is_shotgun_account = (
+            hasattr(deps, "llm_model")
+            and deps.llm_model is not None
+            and deps.llm_model.key_provider == KeyProvider.SHOTGUN
         )
 
+        # Only disable streaming for GPT-5 if NOT a Shotgun account
+        # Shotgun accounts support streaming for GPT-5
+        is_gpt5_byok = "gpt-5" in model_name.lower() and not is_shotgun_account
+
         # Track message send event
         event_name = f"message_send_{self._current_agent_type.value}"
         track_event(
@@ -383,7 +392,9 @@ class AgentManager(Widget):
                 usage_limits=usage_limits,
                 message_history=message_history,
                 deferred_tool_results=deferred_tool_results,
-                event_stream_handler=self._handle_event_stream if not is_gpt5 else None,
+                event_stream_handler=self._handle_event_stream
+                if not is_gpt5_byok
+                else None,
                 **kwargs,
             )
         finally:

shotgun/prompts/agents/partials/common_agent_system_prompt.j2

@@ -20,6 +20,7 @@ Your extensive expertise spans, among other things:
 9. **Be Creative**: If the user seems not to know something, always be creative and come up with ideas that fit their thinking.
 10. Greet the user when you're just starting to work.
 11. DO NOT repeat yourself.
+12. If a user has agreed to a plan, you DO NOT NEED TO FOLLOW UP with them after every step to ask "is this search query ok?".
 
 
 ## Quality Standards

shotgun/tui/screens/chat_screen/history.py

@@ -215,8 +215,18 @@ class AgentResponseWidget(Widget):
         acc = ""
         if self.item is None:
             return ""
+
+        # Check if there's an ask_user tool call
+        has_ask_user = any(
+            isinstance(part, ToolCallPart) and part.tool_name == "ask_user"
+            for part in self.item.parts
+        )
+
         for idx, part in enumerate(self.item.parts):
             if isinstance(part, TextPart):
+                # Skip ALL text parts if there's an ask_user tool call
+                if has_ask_user:
+                    continue
                 # Only show the circle prefix if there's actual content
                 if part.content and part.content.strip():
                     acc += f"**⏺** {part.content}\n\n"
@@ -224,7 +234,25 @@ class AgentResponseWidget(Widget):
                 parts_str = self._format_tool_call_part(part)
                 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):
@@ -305,12 +333,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}"'
@@ -332,7 +364,24 @@ class AgentResponseWidget(Widget):
                 return f"{part.tool_name}({args['name']})"
             return f"▪ {part.tool_name}()"
 
-        return f"{part.tool_name}({part.args})"
+        # 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 f"{part.tool_name}()"
 
     def _format_ask_user_part(
         self,

{shotgun_sh-0.2.5.dev1.dist-info → shotgun_sh-0.2.6.dev1.dist-info}/METADATA

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

@@ -8,7 +8,7 @@ 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/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
-shotgun/agents/agent_manager.py,sha256=xq8L0oAFgtFCpKVsyUoMtYJqUyz5XxjWLKNnxoe1zo4,26577
+shotgun/agents/agent_manager.py,sha256=s3-pP-Y5nXDf-W08nG7FXSB9m8as_aB2I6OWf3SFhvE,26961
 shotgun/agents/common.py,sha256=BINebrcS9BcHu7yDH2yxTjChCmQoUCUrmUMlRnz4_JY,19265
 shotgun/agents/conversation_history.py,sha256=5J8_1yxdZiiWTq22aDio88DkBDZ4_Lh_p5Iy5_ENszc,3898
 shotgun/agents/conversation_manager.py,sha256=fxAvXbEl3Cl2ugJ4N9aWXaqZtkrnfj3QzwjWC4LFXwI,3514
@@ -94,7 +94,7 @@ shotgun/prompts/agents/research.j2,sha256=JBtjXaMVDRuNTt7-Ai8gUb2InfolfqCkQoEkn9
 shotgun/prompts/agents/specify.j2,sha256=AP7XrA3KE7GZsCvW4guASxZHBM2mnrMw3irdZ3RUOBs,2808
 shotgun/prompts/agents/tasks.j2,sha256=9gGCimCWVvpaQSxkAjt7WmIxFHXJY2FlmqhqomFxQTA,5949
 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=rFiPyIc4y1liZPc1SlWvjHLPpaNwyUC0_l7wMZswvVU,2004
 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/state/system_state.j2,sha256=RPweqBYmgWMiDuOjdEDl6NLgYU7HMaUGW1jBSnD5UzQ,1270
@@ -140,7 +140,7 @@ shotgun/tui/screens/welcome.py,sha256=r-RjtzjMhAaA0XKgnYKdZOuE07bcBi223fleKEf-Fa
 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=8rcFrBaCUbDQLNAQXoGXa5dp9AsrvuQMClGcnDaCa5c,14570
 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 +149,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.dev1.dist-info/METADATA,sha256=a7NtlC-7j0n4tJwtUOF49DcSZ4qWCL9IxV9GvsOLoFQ,11226
-shotgun_sh-0.2.5.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.5.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.5.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.5.dev1.dist-info/RECORD,,
+shotgun_sh-0.2.6.dev1.dist-info/METADATA,sha256=t0ADfddOFIsc7uBZHGy-qBO6fO377vx2W_S-GdpZRXg,11226
+shotgun_sh-0.2.6.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.6.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.6.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.6.dev1.dist-info/RECORD,,