shotgun-sh 0.1.0.dev17__tar.gz → 0.1.0.dev18__tar.gz

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.1.0.dev17
+Version: 0.1.0.dev18
 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.0.dev17 → shotgun_sh-0.1.0.dev18}/pyproject.toml

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

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/src/shotgun/agents/agent_manager.py

@@ -17,17 +17,23 @@ from pydantic_ai.agent import AgentRunResult
 from pydantic_ai.messages import (
     AgentStreamEvent,
     FinalResultEvent,
+    FunctionToolCallEvent,
+    FunctionToolResultEvent,
     ModelMessage,
     ModelRequest,
     ModelResponse,
     ModelResponsePart,
     PartDeltaEvent,
     PartStartEvent,
+    SystemPromptPart,
+    ToolCallPart,
     ToolCallPartDelta,
 )
 from textual.message import Message
 from textual.widget import Widget
 
+from shotgun.agents.common import add_system_prompt_message
+
 from .history.compaction import apply_persistent_compaction
 from .models import AgentDeps, AgentRuntimeOptions, FileOperation
 from .plan import create_plan_agent
@@ -264,11 +270,6 @@ class AgentManager(Widget):
             self.ui_message_history.append(ModelRequest.user_text_prompt(prompt))
         self._post_messages_updated()
 
-        # Ensure system prompt is added to message history before running agent
-        from pydantic_ai.messages import SystemPromptPart
-
-        from shotgun.agents.common import add_system_prompt_message
-
         # Start with persistent message history
         message_history = self.message_history
 
@@ -389,19 +390,33 @@ class AgentManager(Widget):
                         state.latest_partial = partial_message
                         self._post_partial_message(partial_message, False)
 
+                elif isinstance(event, FunctionToolCallEvent):
+                    existing_call_idx = next(
+                        (
+                            i
+                            for i, part in enumerate(partial_parts)
+                            if isinstance(part, ToolCallPart)
+                            and part.tool_call_id == event.part.tool_call_id
+                        ),
+                        None,
+                    )
+                    if existing_call_idx is not None:
+                        partial_parts[existing_call_idx] = event.part
+                    else:
+                        partial_parts.append(event.part)
+                    partial_message = self._build_partial_response(partial_parts)
+                    if partial_message is not None:
+                        state.latest_partial = partial_message
+                        self._post_partial_message(partial_message, False)
+                elif isinstance(event, FunctionToolResultEvent):
+                    self.ui_message_history.append(ModelRequest(parts=[event.result]))
+                    self._post_messages_updated()  ## this is what the user responded with
                 elif isinstance(event, FinalResultEvent):
                     final_message = (
                         state.latest_partial
                         or self._build_partial_response(partial_parts)
                     )
-                    self._post_partial_message(final_message, True)
-                    state.latest_partial = None
-                    state.final_sent = True
-                    partial_parts.clear()
-                    self._stream_state = None
-                    break
-
-                # Ignore other AgentStreamEvent variants (e.g. tool call notifications) for partial UI updates.
+                    self._post_partial_message(final_message, False)
 
             except Exception:  # pragma: no cover - defensive logging
                 logger.exception(

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/src/shotgun/agents/tools/user_interaction.py

@@ -13,8 +13,9 @@ logger = get_logger(__name__)
 async def ask_user(ctx: RunContext[AgentDeps], question: str) -> str:
     """Ask the human a question and return the answer.
 
+
     Args:
-        question: The question to ask the user
+        question: The question to ask the user with a clear CTA at the end. Needs to be is readable, clear, and easy to understand. Use Markdown formatting. Make key phrases and words stand out.
 
     Returns:
         The user's response as a string

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/src/shotgun/codebase/core/manager.py

@@ -27,6 +27,14 @@ from shotgun.logging_config import get_logger
 logger = get_logger(__name__)
 
 
+class CodebaseAlreadyIndexedError(Exception):
+    """Raised when a codebase is already indexed."""
+
+    def __init__(self, repo_path: str):
+        self.repo_path = repo_path
+        super().__init__(f"Codebase already indexed: {repo_path}")
+
+
 class CodebaseFileHandler(FileSystemEventHandler):
     """Handles file system events for code graph updates."""
 
@@ -339,9 +347,7 @@ class CodebaseGraphManager:
 
         # Check if graph already exists
         if graph_path.exists():
-            raise ValueError(
-                f"Graph already exists for {repo_path}. Use update_graph() to modify it."
-            )
+            raise CodebaseAlreadyIndexedError(repo_path)
 
         # Import the builder from local core module
         from shotgun.codebase.core import CodebaseIngestor

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/src/shotgun/prompts/agents/research.j2

@@ -23,7 +23,7 @@ Use meaningful artifact IDs like: "api-design-patterns", "microservices-study",
 ## RESEARCH PRINCIPLES
 
 {% if interactive_mode -%}
-- CRITICAL: BEFORE RUNNING ANY SEARCH TOOL, ASK THE USER FOR CONFIRMATION USING ask_user().
+- CRITICAL: BEFORE RUNNING ANY SEARCH TOOL, ASK THE USER FOR APPROVAL USING ask_user(). FINISH THE QUESTION WITH ASKING FOR A GO AHEAD.
 {% endif -%}
 - Build upon existing research rather than starting from scratch
 - Focus on practical, actionable information over theoretical concepts

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/src/shotgun/tui/screens/chat.py

@@ -33,6 +33,7 @@ from shotgun.agents.models import (
     UserAnswer,
     UserQuestion,
 )
+from shotgun.codebase.core.manager import CodebaseAlreadyIndexedError
 from shotgun.sdk.codebase import CodebaseSDK
 from shotgun.sdk.exceptions import CodebaseNotFoundError, InvalidPathError
 from shotgun.sdk.services import get_artifact_service, get_codebase_service
@@ -248,6 +249,12 @@ class CodebaseIndexScreen(ModalScreen[CodebaseIndexSelection | None]):
                     disabled=True,
                 )
 
+    def on_mount(self) -> None:
+        name_input = self.query_one("#index-codebase-name", Input)
+        if not name_input.value and self.selected_path:
+            name_input.value = self.selected_path.name
+        self._update_confirm()
+
     def _update_confirm(self) -> None:
         confirm = self.query_one("#index-confirm", Button)
         name_input = self.query_one("#index-codebase-name", Input)
@@ -475,9 +482,14 @@ class ChatScreen(Screen[None]):
         if event.is_last:
             partial_response_widget.partial_response = None
 
+    def _clear_partial_response(self) -> None:
+        partial_response_widget = self.query_one(ChatHistory)
+        partial_response_widget.partial_response = None
+
     @on(MessageHistoryUpdated)
     def handle_message_history_updated(self, event: MessageHistoryUpdated) -> None:
         """Handle message history updates from the agent manager."""
+        self._clear_partial_response()
         self.messages = event.messages
 
         # If there are file operations, add a message showing the modified files
@@ -611,6 +623,11 @@ class ChatScreen(Screen[None]):
                 severity="information",
                 timeout=8,
             )
+
+            self.mount_hint(codebase_indexed_hint(selection.name))
+        except CodebaseAlreadyIndexedError as exc:
+            self.notify(str(exc), severity="warning")
+            return
         except InvalidPathError as exc:
             self.notify(str(exc), severity="error")
 
@@ -619,7 +636,6 @@ class ChatScreen(Screen[None]):
         finally:
             label.update("")
             label.refresh()
-            self.mount_hint(codebase_indexed_hint(selection.name))
 
     @work
     async def run_agent(self, message: str) -> None:

{shotgun_sh-0.1.0.dev17 → shotgun_sh-0.1.0.dev18}/src/shotgun/tui/screens/chat_screen/history.py

@@ -1,14 +1,17 @@
 import json
+from collections.abc import Sequence
 
 from pydantic_ai.messages import (
     BuiltinToolCallPart,
     BuiltinToolReturnPart,
     ModelMessage,
     ModelRequest,
+    ModelRequestPart,
     ModelResponse,
     TextPart,
     ThinkingPart,
     ToolCallPart,
+    ToolReturnPart,
 )
 from textual.app import ComposeResult
 from textual.reactive import reactive
@@ -78,27 +81,32 @@ class ChatHistory(Widget):
 
     def compose(self) -> ComposeResult:
         self.vertical_tail = VerticalTail()
-        yield self.vertical_tail
-        yield PartialResponseWidget(self.partial_response).data_bind(
-            item=ChatHistory.partial_response
-        )
+        with self.vertical_tail:
+            for item in self.items:
+                if isinstance(item, ModelRequest):
+                    yield UserQuestionWidget(item)
+                elif isinstance(item, ModelResponse):
+                    yield AgentResponseWidget(item)
+            yield PartialResponseWidget(self.partial_response).data_bind(
+                item=ChatHistory.partial_response
+            )
+
+    def watch_partial_response(self, _partial_response: ModelMessage | None) -> None:
+        self.call_after_refresh(self.autoscroll)
 
     def update_messages(self, messages: list[ModelMessage]) -> None:
         """Update the displayed messages without recomposing."""
         if not self.vertical_tail:
             return
 
-        # Clear existing widgets
-        self.vertical_tail.remove_children()
+        self.items = messages
+        self.refresh(recompose=True)
 
-        # Add new message widgets
-        for item in messages:
-            if isinstance(item, ModelRequest):
-                self.vertical_tail.mount(UserQuestionWidget(item))
-            elif isinstance(item, ModelResponse):
-                self.vertical_tail.mount(AgentResponseWidget(item))
+        self.autoscroll()
 
-        self.items = messages
+    def autoscroll(self) -> None:
+        if self.vertical_tail:
+            self.vertical_tail.scroll_end(animate=False)
 
 
 class UserQuestionWidget(Widget):
@@ -116,6 +124,20 @@ class UserQuestionWidget(Widget):
             )
             yield Markdown(markdown=f"**>** {prompt}")
 
+    def format_prompt_parts(self, parts: Sequence[ModelRequestPart]) -> str:
+        acc = ""
+        for part in parts:
+            if isinstance(part, TextPart):
+                acc += (
+                    f"**>** {part.content if isinstance(part.content, str) else ''}\n\n"
+                )
+            elif isinstance(part, ToolCallPart):
+                if part.tool_name == "ask_user" and isinstance(part.content, dict):
+                    acc += f"**>** {part.content['answer']}\n\n"
+                else:
+                    acc += "∟ finished\n\n"  # let's not show anything yet
+        return acc
+
 
 class AgentResponseWidget(Widget):
     def __init__(self, item: ModelResponse | None) -> None:
@@ -133,34 +155,38 @@ class AgentResponseWidget(Widget):
         acc = ""
         if self.item is None:
             return ""
-        for part in self.item.parts:  # TextPart | ToolCallPart | BuiltinToolCallPart | BuiltinToolReturnPart | ThinkingPart
+        for idx, part in enumerate(self.item.parts):
             if isinstance(part, TextPart):
                 acc += part.content + "\n\n"
             elif isinstance(part, ToolCallPart):
                 parts_str = self._format_tool_call_part(part)
                 acc += parts_str + "\n\n"
+            elif isinstance(part, ToolReturnPart):
+                acc += (
+                    f"tool ({part.tool_name}) return: "
+                    + self._format_tool_return_call_part(part)
+                    + "\n\n"
+                )
             elif isinstance(part, BuiltinToolCallPart):
-                acc += f"{part.tool_name}({part.args})\n\n"
+                acc += f"builtin tool ({part.tool_name}): {part.args}\n\n"
             elif isinstance(part, BuiltinToolReturnPart):
-                acc += f"{part.tool_name}()\n\n"
+                acc += f"builtin tool ({part.tool_name}) return: {part.content}\n\n"
             elif isinstance(part, ThinkingPart):
-                acc += f"{part.content}\n\n"
+                if (
+                    idx == len(self.item.parts) - 1
+                ):  # show the thinking part only if it's the last part
+                    acc += (
+                        f"thinking: {part.content}\n\n"
+                        if part.content
+                        else "Thinking..."
+                    )
+                else:
+                    continue
         return acc.strip()
 
     def _format_tool_call_part(self, part: ToolCallPart) -> str:
         if part.tool_name == "ask_user":
-            if isinstance(part.args, str):
-                try:
-                    _args = json.loads(part.args) if part.args.strip() else {}
-                except json.JSONDecodeError:
-                    _args = {}
-            else:
-                _args = part.args
-
-            if isinstance(_args, dict) and "question" in _args:
-                return f"{_args['question']}"
-            else:
-                return "❓ "
+            return self._format_ask_user_part(part)
         if part.tool_name == "write_artifact_section":
             if isinstance(part.args, dict) and "section_title" in part.args:
                 return f"{part.tool_name}({part.args['section_title']})"
@@ -170,6 +196,31 @@ class AgentResponseWidget(Widget):
             if isinstance(part.args, dict) and "name" in part.args:
                 return f"{part.tool_name}({part.args['name']})"
             else:
-                return f"{part.tool_name}()"
+                return f"▪ {part.tool_name}()"
 
         return f"{part.tool_name}({part.args})"
+
+    def _format_ask_user_part(
+        self,
+        part: ToolCallPart,
+    ) -> str:
+        return "*Answer to continue*"
+        if isinstance(part.args, str):
+            try:
+                _args = json.loads(part.args) if part.args.strip() else {}
+            except json.JSONDecodeError:
+                _args = {}
+        else:
+            _args = part.args
+
+        if isinstance(_args, dict) and "question" in _args:
+            return f"{_args['question']}"
+        else:
+            return "❓ "
+
+    def _format_tool_return_call_part(self, part: ToolReturnPart) -> str:
+        content = part.content
+        if part.tool_name == "ask_user":
+            response = content.get("answer", "") if isinstance(content, dict) else ""
+            return f"**⏺** {response}"
+        return f"∟ {content}"