ripperdoc 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

ripperdoc/cli/ui/rich_ui.py

@@ -24,7 +24,7 @@ from prompt_toolkit.shortcuts.prompt import CompleteStyle
 from prompt_toolkit.styles import Style
 
 from ripperdoc.core.config import get_global_config, provider_protocol, model_supports_vision
-from ripperdoc.core.default_tools import get_default_tools
+from ripperdoc.core.default_tools import filter_tools_by_names, get_default_tools
 from ripperdoc.core.theme import get_theme_manager
 from ripperdoc.core.query import query, QueryContext
 from ripperdoc.core.system_prompt import build_system_prompt
@@ -47,7 +47,7 @@ from ripperdoc.cli.ui.thinking_spinner import ThinkingSpinner
 from ripperdoc.cli.ui.context_display import context_usage_lines
 from ripperdoc.cli.ui.panels import create_welcome_panel, create_status_bar, print_shortcuts
 from ripperdoc.cli.ui.message_display import MessageDisplay, parse_bash_output_sections
-from ripperdoc.cli.ui.interrupt_handler import InterruptHandler
+from ripperdoc.cli.ui.interrupt_listener import EscInterruptListener
 from ripperdoc.utils.conversation_compaction import (
     compact_conversation,
     CompactionResult,
@@ -77,11 +77,14 @@ from ripperdoc.utils.messages import (
     UserMessage,
     AssistantMessage,
     ProgressMessage,
+    INTERRUPT_MESSAGE,
+    INTERRUPT_MESSAGE_FOR_TOOL_USE,
     create_user_message,
 )
 from ripperdoc.utils.log import enable_session_file_logging, get_logger
 from ripperdoc.utils.path_ignore import build_ignore_filter
 from ripperdoc.cli.ui.file_mention_completer import FileMentionCompleter
+from ripperdoc.cli.ui.tips import get_random_tip
 from ripperdoc.utils.message_formatting import stringify_message_content
 from ripperdoc.utils.image_utils import read_image_as_base64, is_image_file
 
@@ -349,6 +352,10 @@ class RichUI:
         self._exit_reason: Optional[str] = None
         self._using_tty_input = False  # Track if we're using /dev/tty for input
         self._thinking_mode_enabled = False  # Toggle for extended thinking mode
+        self._interrupt_listener = EscInterruptListener(self._schedule_esc_interrupt, logger=logger)
+        self._esc_interrupt_seen = False
+        self._query_in_progress = False
+        self._active_spinner: Optional[ThinkingSpinner] = None
         hook_manager.set_transcript_path(str(self._session_history.path))
 
         # Create permission checker with Rich console and PromptSession support
@@ -398,8 +405,6 @@ class RichUI:
 
         # Initialize component handlers
         self._message_display = MessageDisplay(self.console, self.verbose, self.show_full_thinking)
-        self._interrupt_handler = InterruptHandler()
-        self._interrupt_handler.set_abort_callback(self._trigger_abort)
 
         # Keep MCP runtime alive for the whole UI session. Create it on the UI loop up front.
         try:
@@ -440,18 +445,6 @@ class RichUI:
     # Properties for backward compatibility with interrupt handler
     # ─────────────────────────────────────────────────────────────────────────────
 
-    @property
-    def _query_interrupted(self) -> bool:
-        return self._interrupt_handler.was_interrupted
-
-    @property
-    def _esc_listener_paused(self) -> bool:
-        return self._interrupt_handler._esc_listener_paused
-
-    @_esc_listener_paused.setter
-    def _esc_listener_paused(self, value: bool) -> None:
-        self._interrupt_handler._esc_listener_paused = value
-
     # ─────────────────────────────────────────────────────────────────────────────
     # Thinking mode toggle
     # ─────────────────────────────────────────────────────────────────────────────
@@ -714,9 +707,10 @@ class RichUI:
         dynamic_tools = await load_dynamic_mcp_tools_async(self.project_path)
 
         if dynamic_tools and self.query_context:
-            self.query_context.tools = merge_tools_with_dynamic(
-                self.query_context.tools, dynamic_tools
-            )
+            merged_tools = merge_tools_with_dynamic(self.query_context.tools, dynamic_tools)
+            if self.allowed_tools is not None:
+                merged_tools = filter_tools_by_names(merged_tools, self.allowed_tools)
+            self.query_context.tools = merged_tools
 
         logger.debug(
             "[ui] Prepared tools and MCP servers",
@@ -924,6 +918,11 @@ class RichUI:
         last_tool_name: Optional[str] = None
 
         if isinstance(message.message.content, str):
+            if self._esc_interrupt_seen and message.message.content.strip() in (
+                INTERRUPT_MESSAGE,
+                INTERRUPT_MESSAGE_FOR_TOOL_USE,
+            ):
+                return last_tool_name
             with pause():
                 self.display_message("Ripperdoc", message.message.content)
         elif isinstance(message.message.content, list):
@@ -1156,11 +1155,26 @@ class RichUI:
             spinner = ThinkingSpinner(console, prompt_tokens_est)
 
             def pause_ui() -> None:
-                spinner.stop()
+                self._pause_interrupt_listener()
+                try:
+                    spinner.stop()
+                except (RuntimeError, ValueError, OSError):
+                    logger.debug("[ui] Failed to pause spinner")
 
             def resume_ui() -> None:
-                spinner.start()
-                spinner.update("Thinking...")
+                if self._esc_interrupt_seen:
+                    return
+                try:
+                    spinner.start()
+                    spinner.update("Thinking...")
+                except (RuntimeError, ValueError, OSError) as exc:
+                    logger.debug(
+                        "[ui] Failed to restart spinner after pause: %s: %s",
+                        type(exc).__name__,
+                        exc,
+                    )
+                finally:
+                    self._resume_interrupt_listener()
 
             self.query_context.pause_ui = pause_ui
             self.query_context.resume_ui = resume_ui
@@ -1169,8 +1183,7 @@ class RichUI:
             base_permission_checker = self._permission_checker
 
             async def permission_checker(tool: Any, parsed_input: Any) -> bool:
-                spinner.stop()
-                was_paused = self._pause_interrupt_listener()
+                pause_ui()
                 try:
                     if base_permission_checker is not None:
                         result = await base_permission_checker(tool, parsed_input)
@@ -1186,18 +1199,7 @@ class RichUI:
                         return allowed
                     return True
                 finally:
-                    self._resume_interrupt_listener(was_paused)
-                    # Wrap spinner restart in try-except to prevent exceptions
-                    # from discarding the permission result
-                    try:
-                        spinner.start()
-                        spinner.update("Thinking...")
-                    except (RuntimeError, ValueError, OSError) as exc:
-                        logger.debug(
-                            "[ui] Failed to restart spinner after permission check: %s: %s",
-                            type(exc).__name__,
-                            exc,
-                        )
+                    resume_ui()
 
             # Process query stream
             tool_registry: Dict[str, Dict[str, Any]] = {}
@@ -1205,6 +1207,10 @@ class RichUI:
             output_token_est = 0
 
             try:
+                self._active_spinner = spinner
+                self._esc_interrupt_seen = False
+                self._query_in_progress = True
+                self._start_interrupt_listener()
                 spinner.start()
                 async for message in query(
                     messages,
@@ -1253,6 +1259,9 @@ class RichUI:
                         extra={"session_id": self.session_id},
                     )
 
+                self._stop_interrupt_listener()
+                self._query_in_progress = False
+                self._active_spinner = None
                 self.conversation_messages = messages
                 logger.info(
                     "[ui] Query processing completed",
@@ -1279,21 +1288,49 @@ class RichUI:
     # ESC Key Interrupt Support
     # ─────────────────────────────────────────────────────────────────────────────
 
-    # Delegate to InterruptHandler
-    def _pause_interrupt_listener(self) -> bool:
-        return self._interrupt_handler.pause_listener()
+    def _schedule_esc_interrupt(self) -> None:
+        """Schedule ESC interrupt handling on the UI event loop."""
+        if self._loop.is_closed():
+            return
+        try:
+            self._loop.call_soon_threadsafe(self._handle_esc_interrupt)
+        except RuntimeError:
+            pass
+
+    def _handle_esc_interrupt(self) -> None:
+        """Abort the current query and display the interrupt notice."""
+        if not self._query_in_progress:
+            return
+        if self._esc_interrupt_seen:
+            return
+        abort_controller = getattr(self.query_context, "abort_controller", None)
+        if abort_controller is None or abort_controller.is_set():
+            return
 
-    def _resume_interrupt_listener(self, previous_state: bool) -> None:
-        self._interrupt_handler.resume_listener(previous_state)
+        self._esc_interrupt_seen = True
 
-    def _trigger_abort(self) -> None:
-        """Signal the query to abort."""
-        if self.query_context and hasattr(self.query_context, "abort_controller"):
-            self.query_context.abort_controller.set()
+        try:
+            if self.query_context and self.query_context.pause_ui:
+                self.query_context.pause_ui()
+            elif self._active_spinner:
+                self._active_spinner.stop()
+        except (RuntimeError, ValueError, OSError):
+            logger.debug("[ui] Failed to pause spinner for ESC interrupt")
 
-    async def _run_query_with_esc_interrupt(self, query_coro: Any) -> bool:
-        """Run a query with ESC key interrupt support."""
-        return await self._interrupt_handler.run_with_interrupt(query_coro)
+        self._message_display.print_interrupt_notice()
+        abort_controller.set()
+
+    def _start_interrupt_listener(self) -> None:
+        self._interrupt_listener.start()
+
+    def _stop_interrupt_listener(self) -> None:
+        self._interrupt_listener.stop()
+
+    def _pause_interrupt_listener(self) -> None:
+        self._interrupt_listener.pause()
+
+    def _resume_interrupt_listener(self) -> None:
+        self._interrupt_listener.resume()
 
     def _run_async(self, coro: Any) -> Any:
         """Run a coroutine on the persistent event loop."""
@@ -1302,16 +1339,6 @@ class RichUI:
             asyncio.set_event_loop(self._loop)
         return self._loop.run_until_complete(coro)
 
-    def _run_async_with_esc_interrupt(self, coro: Any) -> bool:
-        """Run a coroutine with ESC key interrupt support.
-
-        Returns True if interrupted by ESC, False if completed normally.
-        """
-        if self._loop.is_closed():
-            self._loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(self._loop)
-        return self._loop.run_until_complete(self._run_query_with_esc_interrupt(coro))
-
     def run_async(self, coro: Any) -> Any:
         """Public wrapper for running coroutines on the UI event loop."""
         return self._run_async(coro)
@@ -1532,14 +1559,9 @@ class RichUI:
         console.print(create_welcome_panel())
         console.print()
 
-        # Display status
-        console.print(create_status_bar())
-        console.print()
-        console.print(
-            "[dim]Tip: type '/' then press Tab to see available commands. Type '@' to mention files. "
-            "Press Alt+Enter for newline. Press Tab to toggle thinking mode. "
-            "Press ESC to interrupt.[/dim]\n"
-        )
+        # Display random tip
+        random_tip = get_random_tip()
+        console.print(f"[dim italic]💡 {random_tip}[/dim italic]\n")
 
         session = self.get_prompt_session()
         logger.info(
@@ -1562,8 +1584,7 @@ class RichUI:
                 )
                 console.print()  # Add spacing before response
 
-                # Use _run_async instead of _run_async_with_esc_interrupt for piped stdin
-                # since there's no TTY for ESC key detection
+                # Process initial query (ESC interrupt handling removed)
                 self._run_async(self.process_query(self._initial_query))
 
                 logger.info(
@@ -1614,21 +1635,8 @@ class RichUI:
                         },
                     )
 
-                    # When using /dev/tty input, disable ESC interrupt to avoid conflicts
-                    if self._using_tty_input:
-                        self._run_async(self.process_query(user_input))
-                    else:
-                        interrupted = self._run_async_with_esc_interrupt(
-                            self.process_query(user_input)
-                        )
-                        if interrupted:
-                            console.print(
-                                "\n[red]■ Conversation interrupted[/red] · [dim]Tell the model what to do differently.[/dim]"
-                            )
-                            logger.info(
-                                "[ui] Query interrupted by ESC key",
-                                extra={"session_id": self.session_id},
-                            )
+                    # Run query (ESC interrupt handling removed)
+                    self._run_async(self.process_query(user_input))
 
                     console.print()  # Add spacing between interactions
 

ripperdoc/cli/ui/tips.py

@@ -0,0 +1,89 @@
+"""Random tips for Ripperdoc CLI.
+
+This module provides a collection of tips and tricks for using Ripperdoc,
+displayed randomly at startup to help users discover features.
+"""
+
+import random
+from typing import List
+
+# Tips database - organized by category
+TIPS: List[str] = [
+    # Navigation & Input
+    "Press Tab to toggle thinking mode - see the AI's full reasoning process.",
+    "Use @ followed by a file path to reference files in your conversation.",
+    "Press Alt+Enter to insert newlines in your input for multi-line prompts.",
+    "Type / then press Tab to see all available slash commands.",
+    "Double-press Ctrl+C to quickly exit Ripperdoc.",
+
+    # Slash Commands
+    "Use /help to see all available commands and get started.",
+    "Use /clear to clear the current conversation and start fresh.",
+    "Use /compact to compress conversation history when tokens run low.",
+    "Use /status to check your session statistics and context usage.",
+    "Use /cost to estimate token costs for your current session.",
+    "Use /theme to switch between different visual themes (light, dark, etc.).",
+    "Use /models to list and switch between different AI models.",
+    "Use /tools to see what tools are available to the AI agent.",
+    "Use /agents to manage specialized AI agents for specific tasks.",
+    "Use /config to view or modify your Ripperdoc configuration.",
+    "Use /todos to track tasks and manage your todo list.",
+
+    # Advanced Features
+    "Use /plan to enter planning mode for complex tasks requiring exploration.",
+    "Use /memory to enable persistent memory across sessions.",
+    "Use /skills to load and manage custom skill packages.",
+    "Use /mcp to configure Model Context Protocol servers for extended capabilities.",
+    "Use /permissions to adjust tool permission settings.",
+    "Use /context to manage context window and conversation history.",
+    "Use /resume to continue your most recent conversation.",
+
+    # Productivity
+    "Use /exit to cleanly shut down Ripperdoc and save your session.",
+    "Use /doctor to diagnose common issues and configuration problems.",
+    "Use /hooks to manage custom hooks for session lifecycle events.",
+
+    # File Operations
+    "Reference images with @path/to/image.png if your model supports vision.",
+    "Use /tasks to view and manage background tasks.",
+
+    # Hidden/Power User Features
+    "Create custom commands in .ripperdoc/commands/ for reusable workflows.",
+    "Configure hooks in .ripperdoc/hooks/ to automate session events.",
+    "Use --yolo mode to skip all permission prompts (use with caution!).",
+    "Pipe stdin into Ripperdoc: echo 'your query' | ripperdoc",
+    "Use -p flag for single-shot queries: ripperdoc -p 'your prompt'",
+
+    # MCP & Extensions
+    "Connect to MCP servers to extend Ripperdoc with external tools and data sources.",
+    "Use /skills to enable specialized capabilities like PDF or spreadsheet processing.",
+
+    # Session Management
+    "Sessions are automatically saved in .ripperdoc/sessions/.",
+    "Use /continue or -c flag to resume your last conversation.",
+
+    # Cost & Performance
+    "Enable auto-compact in settings to automatically manage token usage.",
+    "Use /cost to monitor token consumption and estimate API costs.",
+
+    # Tips about Tips
+    "A new tip appears each time you start Ripperdoc - try restarting to see more!",
+]
+
+
+def get_random_tip() -> str:
+    """Get a random tip from the tips database.
+
+    Returns:
+        A randomly selected tip string.
+    """
+    return random.choice(TIPS)
+
+
+def get_tips_count() -> int:
+    """Get the total number of tips available.
+
+    Returns:
+        The count of tips in the database.
+    """
+    return len(TIPS)

ripperdoc/cli/ui/wizard.py

@@ -8,6 +8,7 @@ from typing import List, Optional, Tuple
 import click
 from rich.console import Console
 
+from ripperdoc.cli.ui.choice import ChoiceOption, onboarding_style, prompt_choice
 from ripperdoc.cli.ui.provider_options import (
     KNOWN_PROVIDERS,
     ProviderOption,
@@ -66,38 +67,64 @@ def check_onboarding() -> bool:
 
 def run_onboarding_wizard(config: GlobalConfig) -> bool:
     """Run interactive onboarding wizard."""
-    provider_keys = KNOWN_PROVIDERS.keys() + ["custom"]
+    provider_keys = list(KNOWN_PROVIDERS.keys()) + ["custom"]
     default_choice_key = KNOWN_PROVIDERS.default_choice.key
 
-    # Display provider options vertically
-    console.print("[bold]Available providers:[/bold]")
-    for i, provider_key in enumerate(provider_keys, 1):
-        marker = "[cyan]→[/cyan]" if provider_key == default_choice_key else " "
-        console.print(f"  {marker} {i}. {provider_key}")
-    console.print("")
-
-    # Prompt for provider choice with validation
-    provider_choice: Optional[str] = None
-    while provider_choice is None:
-        raw_choice = click.prompt(
-            "Choose your model provider",
-            default=default_choice_key,
+    # Build provider choice options with rich styling
+    provider_options = [
+        ChoiceOption(
+            key,
+            key,  # Plain text, not colored
+            is_default=(key == default_choice_key),
         )
-        provider_choice = resolve_provider_choice(raw_choice, provider_keys)
-        if provider_choice is None:
-            console.print(
-                f"[red]Invalid choice. Please enter a provider name or number (1-{len(provider_keys)}).[/red]"
-            )
+        for key in provider_keys
+    ]
+
+    # Prompt for provider choice using unified choice component
+    provider_choice = prompt_choice(
+        message="Choose your model provider",
+        options=provider_options,
+        title="Available providers",
+        allow_esc=True,
+        esc_value=default_choice_key,
+        style=onboarding_style(),
+    )
+
+    # Validate the choice (in case user typed an invalid value)
+    validated_choice = resolve_provider_choice(provider_choice, provider_keys)
+    if validated_choice is None:
+        console.print(
+            f"[red]Invalid choice. Please enter a provider name or number (1-{len(provider_keys)}).[/red]"
+        )
+        return run_onboarding_wizard(config)
+    provider_choice = validated_choice
 
     api_base_override: Optional[str] = None
     if provider_choice == "custom":
-        protocol_input = click.prompt(
-            "Protocol family (for API compatibility)",
-            type=click.Choice([p.value for p in ProviderType]),
-            default=ProviderType.OPENAI_COMPATIBLE.value,
+        # Build protocol choice options
+        protocol_options = [
+            ChoiceOption(
+                p.value,
+                p.value,  # Plain text
+                is_default=(p == ProviderType.OPENAI_COMPATIBLE),
+            )
+            for p in ProviderType
+        ]
+
+        protocol_input = prompt_choice(
+            message="Choose the protocol family (for API compatibility)",
+            options=protocol_options,
+            title="Custom Provider - Protocol Selection",
+            allow_esc=True,
+            esc_value=ProviderType.OPENAI_COMPATIBLE.value,
+            style=onboarding_style(),
         )
         protocol = ProviderType(protocol_input)
-        api_base_override = click.prompt("API Base URL")
+
+        # Get API base URL - use click.prompt for free-form text input
+        console.print("\n[dim]Now we need your API Base URL.[/dim]")
+        api_base_override = click.prompt("API Base URL").strip()
+
         provider_option = ProviderOption(
             key="custom",
             protocol=protocol,
@@ -160,29 +187,55 @@ def get_model_name_with_suggestions(
     default_model = provider.default_model or default_model_for_protocol(provider.protocol)
     suggestions = list(provider.model_suggestions)
 
-    # Show suggestions if available
+    # Prompt for model name using unified choice component if suggestions exist
     if suggestions:
-        console.print("\n[dim]Available models for this provider:[/dim]")
-        for i, model_name in enumerate(suggestions[:5]):  # Show top 5
-            console.print(f"  [dim]{i + 1}. {model_name}[/dim]")
-        console.print("")
-
-    # Prompt for model name
-    if provider.protocol == ProviderType.ANTHROPIC:
-        model = click.prompt("Model name", default=default_model)
-    elif provider.protocol == ProviderType.OPENAI_COMPATIBLE:
-        model = click.prompt("Model name", default=default_model)
-        # Prompt for API base if still not set
-        if api_base is None:
-            api_base_input = click.prompt("API base URL (optional)", default="", show_default=False)
-            api_base = api_base_input or None
-    elif provider.protocol == ProviderType.GEMINI:
-        model = click.prompt("Model name", default=default_model)
-        if api_base is None:
-            api_base_input = click.prompt("API base URL (optional)", default="", show_default=False)
-            api_base = api_base_input or None
+        # Create choice options for models
+        model_options = [
+            ChoiceOption(model, model)  # Plain text
+            for model in suggestions[:5]  # Show top 5
+        ]
+        # Add custom option
+        model_options.append(ChoiceOption("custom", "<dim>Custom model...</dim>"))
+
+        model = prompt_choice(
+            message="Select a model or choose 'Custom' to enter manually",
+            options=model_options,
+            title="Available models for this provider",
+            description=f"Default: {default_model}",
+            allow_esc=True,
+            esc_value=default_model,
+            style=onboarding_style(),
+        )
+
+        # If user chose custom, prompt for manual input using click.prompt
+        if model == "custom":
+            console.print("\n[dim]Enter your custom model name:[/dim]")
+            model = click.prompt("Model name", default=default_model).strip()
     else:
-        model = click.prompt("Model name", default=default_model)
+        # No suggestions, use default
+        model = default_model
+
+    # Prompt for API base if still not set (for OpenAI-compatible providers)
+    if provider.protocol == ProviderType.OPENAI_COMPATIBLE and api_base is None:
+        api_base_input = prompt_choice(
+            message="Enter API base URL (or press Enter to skip)",
+            options=[ChoiceOption("", "<dim>Skip</dim>")],
+            title="API base URL (optional)",
+            allow_esc=True,
+            esc_value="",
+            style=onboarding_style(),
+        )
+        api_base = api_base_input or None
+    elif provider.protocol == ProviderType.GEMINI and api_base is None:
+        api_base_input = prompt_choice(
+            message="Enter API base URL (or press Enter to skip)",
+            options=[ChoiceOption("", "<dim>Skip</dim>")],
+            title="API base URL (optional)",
+            allow_esc=True,
+            esc_value="",
+            style=onboarding_style(),
+        )
+        api_base = api_base_input or None
 
     return model, api_base
 

ripperdoc/core/config.py

@@ -230,6 +230,7 @@ class GlobalConfig(BaseModel):
     # User-level permission rules (applied globally)
     user_allow_rules: list[str] = Field(default_factory=list)
     user_deny_rules: list[str] = Field(default_factory=list)
+    user_ask_rules: list[str] = Field(default_factory=list)
 
     # Onboarding
     has_completed_onboarding: bool = False
@@ -258,6 +259,7 @@ class ProjectConfig(BaseModel):
     allowed_tools: list[str] = Field(default_factory=list)
     bash_allow_rules: list[str] = Field(default_factory=list)
     bash_deny_rules: list[str] = Field(default_factory=list)
+    bash_ask_rules: list[str] = Field(default_factory=list)
     working_directories: list[str] = Field(default_factory=list)
 
     # Path ignore patterns (gitignore-style)
@@ -291,6 +293,7 @@ class ProjectLocalConfig(BaseModel):
     # Local permission rules (project-specific but not shared)
     local_allow_rules: list[str] = Field(default_factory=list)
     local_deny_rules: list[str] = Field(default_factory=list)
+    local_ask_rules: list[str] = Field(default_factory=list)
 
 
 class ConfigManager: