shotgun-sh 0.1.12.dev2__tar.gz → 0.1.12.dev4__tar.gz

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/PKG-INFO

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

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

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/src/shotgun/codebase/core/manager.py

@@ -353,7 +353,19 @@ class CodebaseGraphManager:
 
         # Check if graph already exists
         if graph_path.exists():
-            raise CodebaseAlreadyIndexedError(repo_path)
+            # Verify it's not corrupted by checking if we can load the Project node
+            existing_graph = await self.get_graph(graph_id)
+            if existing_graph:
+                # Valid existing graph
+                raise CodebaseAlreadyIndexedError(repo_path)
+            else:
+                # Corrupted database - remove and re-index
+                logger.warning(
+                    f"Found corrupted database at {graph_path}, removing for re-indexing..."
+                )
+                import shutil
+
+                shutil.rmtree(graph_path)
 
         # Import the builder from local core module
         from shotgun.codebase.core import CodebaseIngestor

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/src/shotgun/codebase/service.py

@@ -69,6 +69,10 @@ class CodebaseService:
             # Otherwise, check if current directory is in the allowed list
             elif target_path in graph.indexed_from_cwds:
                 filtered_graphs.append(graph)
+            # Also allow access if current directory IS the repository itself
+            # Use Path.resolve() for robust comparison (handles symlinks, etc.)
+            elif Path(target_path).resolve() == Path(graph.repo_path).resolve():
+                filtered_graphs.append(graph)
 
         return filtered_graphs
 

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/src/shotgun/main.py

@@ -118,7 +118,15 @@ def main(
 
     if ctx.invoked_subcommand is None and not ctx.resilient_parsing:
         logger.debug("Launching shotgun TUI application")
-        tui_app.run(no_update_check=no_update_check, continue_session=continue_session)
+        try:
+            tui_app.run(
+                no_update_check=no_update_check, continue_session=continue_session
+            )
+        finally:
+            # Ensure PostHog is shut down cleanly even if TUI exits unexpectedly
+            from shotgun.posthog_telemetry import shutdown
+
+            shutdown()
         raise typer.Exit()
 
     # For CLI commands, register PostHog shutdown handler

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/src/shotgun/tui/app.py

@@ -83,6 +83,10 @@ class ShotgunApp(App[None]):
 
     async def action_quit(self) -> None:
         """Quit the application."""
+        # Shut down PostHog client to prevent threading errors
+        from shotgun.posthog_telemetry import shutdown
+
+        shutdown()
         self.exit()
 
     def get_system_commands(self, screen: Screen[Any]) -> Iterable[SystemCommand]:

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/src/shotgun/tui/screens/chat.py

@@ -16,6 +16,7 @@ from textual import events, on, work
 from textual.app import ComposeResult
 from textual.command import CommandPalette
 from textual.containers import Container, Grid
+from textual.keys import Keys
 from textual.reactive import reactive
 from textual.screen import ModalScreen, Screen
 from textual.widget import Widget
@@ -285,13 +286,18 @@ class ChatScreen(Screen[None]):
 
     async def on_key(self, event: events.Key) -> None:
         """Handle key presses for cancellation."""
-        # If escape is pressed while agent is working, cancel the operation
-        if event.key == "escape" and self.working and self._current_worker:
-            # Track ESC cancellation event
+        # If escape or ctrl+c is pressed while agent is working, cancel the operation
+        if (
+            event.key in (Keys.Escape, Keys.ControlC)
+            and self.working
+            and self._current_worker
+        ):
+            # Track cancellation event
             track_event(
-                "agent_cancelled_escape",
+                "agent_cancelled",
                 {
                     "agent_mode": self.mode.value,
+                    "cancel_key": event.key,
                 },
             )
 
@@ -302,6 +308,8 @@ class ChatScreen(Screen[None]):
             # Re-enable the input
             prompt_input = self.query_one(PromptInput)
             prompt_input.focus()
+            # Prevent the event from propagating (don't quit the app)
+            event.stop()
 
     @work
     async def check_if_codebase_is_indexed(self) -> None:

{shotgun_sh-0.1.12.dev2 → shotgun_sh-0.1.12.dev4}/src/shotgun/tui/screens/chat_screen/history.py

@@ -238,25 +238,97 @@ class AgentResponseWidget(Widget):
                     continue
         return acc.strip()
 
+    def _truncate(self, text: str, max_length: int = 100) -> str:
+        """Truncate text to max_length characters, adding ellipsis if needed."""
+        if len(text) <= max_length:
+            return text
+        return text[: max_length - 3] + "..."
+
+    def _parse_args(self, args: dict[str, object] | str | None) -> dict[str, object]:
+        """Parse tool call arguments, handling both dict and JSON string formats."""
+        if args is None:
+            return {}
+        if isinstance(args, str):
+            try:
+                return json.loads(args) if args.strip() else {}
+            except json.JSONDecodeError:
+                return {}
+        return args if isinstance(args, dict) else {}
+
     def _format_tool_call_part(self, part: ToolCallPart) -> str:
         if part.tool_name == "ask_user":
             return self._format_ask_user_part(part)
+
+        # Parse args once (handles both JSON string and dict)
+        args = self._parse_args(part.args)
+
+        # Codebase tools - show friendly names
+        if part.tool_name == "query_graph":
+            if "query" in args:
+                query = self._truncate(str(args["query"]))
+                return f'Querying code: "{query}"'
+            return "Querying code"
+
+        if part.tool_name == "retrieve_code":
+            if "qualified_name" in args:
+                return f'Retrieving code: "{args["qualified_name"]}"'
+            return "Retrieving code"
+
+        if part.tool_name == "file_read":
+            if "file_path" in args:
+                return f'Reading file: "{args["file_path"]}"'
+            return "Reading file"
+
+        if part.tool_name == "directory_lister":
+            if "directory" in args:
+                return f'Listing directory: "{args["directory"]}"'
+            return "Listing directory"
+
+        if part.tool_name == "codebase_shell":
+            command = args.get("command", "")
+            cmd_args = args.get("args", [])
+            # Handle cmd_args as list of strings
+            if isinstance(cmd_args, list):
+                args_str = " ".join(str(arg) for arg in cmd_args)
+            else:
+                args_str = ""
+            full_cmd = f"{command} {args_str}".strip()
+            if full_cmd:
+                return f'Running shell: "{self._truncate(full_cmd)}"'
+            return "Running shell"
+
+        # File management tools
+        if part.tool_name == "read_file":
+            if "filename" in args:
+                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",
+        ]:
+            if "query" in args:
+                query = self._truncate(str(args["query"]))
+                return f'Searching web: "{query}"'
+            return "Searching web"
+
         # write_file
         if part.tool_name == "write_file" or part.tool_name == "append_file":
-            if isinstance(part.args, dict) and "filename" in part.args:
-                return f"{part.tool_name}({part.args['filename']})"
-            else:
-                return f"{part.tool_name}()"
+            if "filename" in args:
+                return f"{part.tool_name}({args['filename']})"
+            return f"{part.tool_name}()"
+
         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']})"
-            else:
-                return f"{part.tool_name}()"
+            if "section_title" in args:
+                return f"{part.tool_name}({args['section_title']})"
+            return f"{part.tool_name}()"
+
         if part.tool_name == "create_artifact":
-            if isinstance(part.args, dict) and "name" in part.args:
-                return f"{part.tool_name}({part.args['name']})"
-            else:
-                return f"▪ {part.tool_name}()"
+            if "name" in args:
+                return f"{part.tool_name}({args['name']})"
+            return f"▪ {part.tool_name}()"
 
         return f"{part.tool_name}({part.args})"