shotgun-sh 0.2.8.dev1__py3-none-any.whl → 0.2.8.dev2__py3-none-any.whl

shotgun/agents/agent_manager.py

@@ -381,14 +381,21 @@ class AgentManager(Widget):
 
         # Clear file tracker before each run to track only this run's operations
         deps.file_tracker.clear()
-        # preprocess messages; maybe we need to include the user answer in the message history
-
-        original_messages = self.ui_message_history.copy()
 
+        # Add user prompt if present (will be shown immediately via post_messages_updated)
         if prompt:
-            self.ui_message_history.append(ModelRequest.user_text_prompt(prompt))
+            user_request = ModelRequest.user_text_prompt(prompt)
+            self.ui_message_history.append(user_request)
+
+        # Always post update before run to show user message (or current state if no prompt)
         self._post_messages_updated()
 
+        # Save history WITHOUT the just-added prompt to avoid duplicates
+        # (result.new_messages() will include the prompt)
+        original_messages = (
+            self.ui_message_history[:-1] if prompt else self.ui_message_history.copy()
+        )
+
         # Start with persistent message history
         message_history = self.message_history
 

shotgun/main.py

@@ -125,34 +125,6 @@ def main(
             help="Continue previous TUI conversation",
         ),
     ] = False,
-    web: Annotated[
-        bool,
-        typer.Option(
-            "--web",
-            help="Serve TUI as web application",
-        ),
-    ] = False,
-    port: Annotated[
-        int,
-        typer.Option(
-            "--port",
-            help="Port for web server (only used with --web)",
-        ),
-    ] = 8000,
-    host: Annotated[
-        str,
-        typer.Option(
-            "--host",
-            help="Host address for web server (only used with --web)",
-        ),
-    ] = "localhost",
-    public_url: Annotated[
-        str | None,
-        typer.Option(
-            "--public-url",
-            help="Public URL if behind proxy (only used with --web)",
-        ),
-    ] = None,
 ) -> None:
     """Shotgun - AI-powered CLI tool."""
     logger.debug("Starting shotgun CLI application")
@@ -162,32 +134,16 @@ def main(
         perform_auto_update_async(no_update_check=no_update_check)
 
     if ctx.invoked_subcommand is None and not ctx.resilient_parsing:
-        if web:
-            logger.debug("Launching shotgun TUI as web application")
-            try:
-                tui_app.serve(
-                    host=host,
-                    port=port,
-                    public_url=public_url,
-                    no_update_check=no_update_check,
-                    continue_session=continue_session,
-                )
-            finally:
-                # Ensure PostHog is shut down cleanly even if server exits unexpectedly
-                from shotgun.posthog_telemetry import shutdown
-
-                shutdown()
-        else:
-            logger.debug("Launching shotgun TUI application")
-            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()
+        logger.debug("Launching shotgun TUI application")
+        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/tui/app.py

@@ -152,121 +152,5 @@ def run(no_update_check: bool = False, continue_session: bool = False) -> None:
     app.run(inline_no_clear=True)
 
 
-def serve(
-    host: str = "localhost",
-    port: int = 8000,
-    public_url: str | None = None,
-    no_update_check: bool = False,
-    continue_session: bool = False,
-) -> None:
-    """Serve the TUI application as a web application.
-
-    Args:
-        host: Host address for the web server.
-        port: Port number for the web server.
-        public_url: Public URL if behind a proxy.
-        no_update_check: If True, disable automatic update checks.
-        continue_session: If True, continue from previous conversation.
-    """
-    # Clean up any corrupted databases BEFORE starting the TUI
-    # This prevents crashes from corrupted databases during initialization
-    import asyncio
-
-    from textual_serve.server import Server
-
-    from shotgun.codebase.core.manager import CodebaseGraphManager
-    from shotgun.utils import get_shotgun_home
-
-    storage_dir = get_shotgun_home() / "codebases"
-    manager = CodebaseGraphManager(storage_dir)
-
-    try:
-        removed = asyncio.run(manager.cleanup_corrupted_databases())
-        if removed:
-            logger.info(
-                f"Cleaned up {len(removed)} corrupted database(s) before TUI startup"
-            )
-    except Exception as e:
-        logger.error(f"Failed to cleanup corrupted databases: {e}")
-        # Continue anyway - the TUI can still function
-
-    # Create a new event loop after asyncio.run() closes the previous one
-    # This is needed for the Server.serve() method
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
-    # Build the command string based on flags
-    command = "shotgun"
-    if no_update_check:
-        command += " --no-update-check"
-    if continue_session:
-        command += " --continue"
-
-    # Create and start the server with hardcoded title and debug=False
-    server = Server(
-        command=command,
-        host=host,
-        port=port,
-        title="The Shotgun",
-        public_url=public_url,
-    )
-
-    # Set up graceful shutdown on SIGTERM/SIGINT
-    import signal
-    import sys
-
-    def signal_handler(_signum: int, _frame: Any) -> None:
-        """Handle shutdown signals gracefully."""
-        from shotgun.posthog_telemetry import shutdown
-
-        logger.info("Received shutdown signal, cleaning up...")
-        # Restore stdout/stderr before shutting down
-        sys.stdout = original_stdout
-        sys.stderr = original_stderr
-        shutdown()
-        sys.exit(0)
-
-    signal.signal(signal.SIGTERM, signal_handler)
-    signal.signal(signal.SIGINT, signal_handler)
-
-    # Suppress the textual-serve banner by redirecting stdout/stderr
-    import io
-
-    # Capture and suppress the banner, but show the actual serving URL
-    original_stdout = sys.stdout
-    original_stderr = sys.stderr
-
-    captured_output = io.StringIO()
-    sys.stdout = captured_output
-    sys.stderr = captured_output
-
-    try:
-        # This will print the banner to our captured output
-        import logging
-
-        # Temporarily set logging to ERROR level to suppress INFO messages
-        textual_serve_logger = logging.getLogger("textual_serve")
-        original_level = textual_serve_logger.level
-        textual_serve_logger.setLevel(logging.ERROR)
-
-        # Print our own message to the original stdout
-        sys.stdout = original_stdout
-        sys.stderr = original_stderr
-        print(f"Serving Shotgun TUI at http://{host}:{port}")
-        print("Press Ctrl+C to quit")
-
-        # Now suppress output again for the serve call
-        sys.stdout = captured_output
-        sys.stderr = captured_output
-
-        server.serve(debug=False)
-    finally:
-        # Restore original stdout/stderr
-        sys.stdout = original_stdout
-        sys.stderr = original_stderr
-        if "textual_serve_logger" in locals():
-            textual_serve_logger.setLevel(original_level)
-
-
 if __name__ == "__main__":
     run()

{shotgun_sh-0.2.8.dev1.dist-info → shotgun_sh-0.2.8.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.8.dev1
+Version: 0.2.8.dev2
 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
@@ -36,7 +36,6 @@ Requires-Dist: sentencepiece>=0.2.0
 Requires-Dist: sentry-sdk[pure-eval]>=2.0.0
 Requires-Dist: tenacity>=8.0.0
 Requires-Dist: textual-dev>=1.7.0
-Requires-Dist: textual-serve>=0.1.0
 Requires-Dist: textual>=6.1.0
 Requires-Dist: tiktoken>=0.7.0
 Requires-Dist: tree-sitter-go>=0.23.0

{shotgun_sh-0.2.8.dev1.dist-info → shotgun_sh-0.2.8.dev2.dist-info}/RECORD

@@ -2,13 +2,13 @@ shotgun/__init__.py,sha256=P40K0fnIsb7SKcQrFnXZ4aREjpWchVDhvM1HxI4cyIQ,104
 shotgun/api_endpoints.py,sha256=TvxuJyMrZLy6KZTrR6lrdkG8OBtb3TJ48qaw3pWitO0,526
 shotgun/build_constants.py,sha256=RXNxMz46HaB5jucgMVpw8a2yCJqjbhTOh0PddyEVMN8,713
 shotgun/logging_config.py,sha256=UKenihvgH8OA3W0b8ZFcItYaFJVe9MlsMYlcevyW1HY,7440
-shotgun/main.py,sha256=8t-jw4KZAlvUVvoqMlp0rTVCXtJx4herSheI2N8i-8Y,6445
+shotgun/main.py,sha256=RA3q1xPfqxCu43UmgI2ryZpA-IxPhJb_MJrbLqp9c_g,5140
 shotgun/posthog_telemetry.py,sha256=TOiyBtLg21SttHGWKc4-e-PQgpbq6Uz_4OzlvlxMcZ0,6099
 shotgun/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shotgun/sentry_telemetry.py,sha256=VD8es-tREfgtRKhDsEVvqpo0_kM_ab6iVm2lkOEmTlI,2950
 shotgun/telemetry.py,sha256=C8dM7Feo1OxJMwDvgAMaA2RyRDO2rYPvC_8kLBuRUS8,3683
 shotgun/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
-shotgun/agents/agent_manager.py,sha256=CgG_Cj1P_ZB7wzwvqqqJ5gxOUVKTGy_o0VS4eaB7NqI,39522
+shotgun/agents/agent_manager.py,sha256=cdrw96weXEkqaLGgmIPgnA48iMR1fYBLu_05p1eMHtQ,39851
 shotgun/agents/common.py,sha256=0F_dwEc72APvbY1b-lqM9VgPYuY1GpfhjSWv5-1pCB0,19032
 shotgun/agents/conversation_history.py,sha256=c-1PBaG9FXPfSmekWtrD6s6YVT0sd98DdDhzS4a1Hyo,7859
 shotgun/agents/conversation_manager.py,sha256=X3DWZZIqrv0hS1SUasyoxexnLPBUrZMBg4ZmRAipkBE,4429
@@ -119,7 +119,7 @@ shotgun/shotgun_web/client.py,sha256=n5DDuVfSa6VPZjhSsfSxQlSFOnhgDHyidRnB8Hv9XF4
 shotgun/shotgun_web/constants.py,sha256=eNvtjlu81bAVQaCwZXOVjSpDopUm9pf34XuZEvuMiko,661
 shotgun/shotgun_web/models.py,sha256=Ie9VfqKZM2tIJhIjentU9qLoNaMZvnUJaIu-xg9kQsA,1391
 shotgun/tui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shotgun/tui/app.py,sha256=dBoniec5iscVozM7BTDiKAwMWLUvzw2CioLiTqtmoqo,9184
+shotgun/tui/app.py,sha256=B2tKbXeGhWBIVec1jJHGAuBcP1SMbO_6xol2OaBpw2Y,5374
 shotgun/tui/filtered_codebase_service.py,sha256=lJ8gTMhIveTatmvmGLP299msWWTkVYKwvY_2FhuL2s4,1687
 shotgun/tui/styles.tcss,sha256=ETyyw1bpMBOqTi5RLcAJUScdPWTvAWEqE9YcT0kVs_E,121
 shotgun/tui/commands/__init__.py,sha256=8D5lvtpqMW5-fF7Bg3oJtUzU75cKOv6aUaHYYszydU8,2518
@@ -148,8 +148,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.8.dev1.dist-info/METADATA,sha256=razgwSFigJNH56uBlRPZ8yxyQjjvThAbMZpHlPI4_JY,4335
-shotgun_sh-0.2.8.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.8.dev1.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.8.dev1.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.8.dev1.dist-info/RECORD,,
+shotgun_sh-0.2.8.dev2.dist-info/METADATA,sha256=8nSxwROnGNuQxNUY8bovpYeFSCwHhnLLx4geGZZVaKo,4299
+shotgun_sh-0.2.8.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.8.dev2.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.8.dev2.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.8.dev2.dist-info/RECORD,,