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

ripperdoc/cli/ui/spinner.py

@@ -1,45 +1,108 @@
 from contextlib import contextmanager
+import shutil
+import sys
 from typing import Any, Generator, Literal, Optional
 
 from rich.console import Console
-from rich.markup import escape
-from rich.status import Status
+from rich.live import Live
+from rich.text import Text
+from rich.spinner import Spinner as RichSpinner
+
+from ripperdoc.core.theme import theme_color
+
+# ANSI escape sequences for terminal control
+_CLEAR_LINE = "\r\033[K"  # Move to start of line and clear to end
 
 
 class Spinner:
-    """Lightweight spinner wrapper for Rich status."""
+    """Lightweight spinner wrapper that plays nicely with other console output."""
+
+    # Reserve space for spinner animation (e.g., "⠧ ") and safety margin
+    _SPINNER_MARGIN = 6
 
     def __init__(self, console: Console, text: str = "Thinking...", spinner: str = "dots"):
         self.console = console
         self.text = text
         self.spinner = spinner
-        self._status: Optional[Status] = None
+        self._style = theme_color("spinner")
+        self._live: Optional[Live] = None
+        # Spinner color from theme for visual separation in the terminal
+        self._renderable: RichSpinner = RichSpinner(
+            spinner,
+            text=Text(self._fit_to_terminal(self.text), style=self._style),
+            style=self._style,
+        )
+
+    def _get_terminal_width(self) -> int:
+        """Get current terminal width, with fallback."""
+        try:
+            return shutil.get_terminal_size().columns
+        except Exception:
+            return 80  # Reasonable default
+
+    def _fit_to_terminal(self, text: str) -> str:
+        """Truncate text to fit within terminal width, preventing line wrap issues.
+
+        This ensures spinner text never causes terminal wrapping, which would
+        leave artifacts when the spinner refreshes or stops.
+        """
+        max_width = self._get_terminal_width() - self._SPINNER_MARGIN
+        if max_width < 20:
+            max_width = 20  # Minimum usable width
+
+        if len(text) <= max_width:
+            return text
+
+        # Smart truncation: keep the structure intact
+        # Find the last complete parenthetical group if possible
+        truncated = text[: max_width - 1] + "…"
+        return truncated
+
+    def _clear_line(self) -> None:
+        """Clear the current terminal line to prevent artifacts."""
+        if self.console.is_terminal:
+            try:
+                sys.stdout.write(_CLEAR_LINE)
+                sys.stdout.flush()
+            except Exception:
+                pass  # Ignore errors in non-TTY environments
 
     def start(self) -> None:
         """Start the spinner if not already running."""
-
-        if self._status is not None:
+        if self._live is not None:
             return
-        self._status = self.console.status(
-            f"[cyan]{escape(self.text)}[/cyan]", spinner=self.spinner
+        # Clear any residual content on current line before starting
+        self._clear_line()
+        self._renderable.text = Text(self._fit_to_terminal(self.text), style=self._style)
+        self._live = Live(
+            self._renderable,
+            console=self.console,
+            transient=True,  # Remove spinner line when stopped to avoid layout glitches
+            refresh_per_second=12,
+            vertical_overflow="ellipsis",  # Prevent multi-line overflow issues
         )
-        self._status.__enter__()
+        self._live.start()
 
     def update(self, text: Optional[str] = None) -> None:
         """Update spinner text."""
-
-        if self._status is None:
+        if self._live is None:
             return
-        new_text = text if text is not None else self.text
-        self._status.update(f"[cyan]{escape(new_text)}[/cyan]")
+        if text is not None:
+            self.text = text
+        self._renderable.text = Text(self._fit_to_terminal(self.text), style=self._style)
+        # Live.refresh() redraws the current renderable
+        self._live.refresh()
 
     def stop(self) -> None:
         """Stop the spinner if running."""
-
-        if self._status is None:
+        if self._live is None:
             return
-        self._status.__exit__(None, None, None)
-        self._status = None
+        try:
+            self._live.stop()
+            # Clear line to ensure no artifacts remain from long spinner text
+            self._clear_line()
+        finally:
+            self._live = None
 
     def __enter__(self) -> "Spinner":
         self.start()
@@ -53,7 +116,7 @@ class Spinner:
     @property
     def is_running(self) -> bool:
         """Check if spinner is currently running."""
-        return self._status is not None
+        return self._live is not None
 
     @contextmanager
     def paused(self) -> Generator[None, None, None]:
@@ -70,4 +133,16 @@ class Spinner:
             yield
         finally:
             if was_running:
+                # Ensure all output is flushed and cursor is on a clean line
+                # before restarting the spinner
+                try:
+                    # Flush console buffer
+                    self.console.file.flush()
+                    # Clear any partial line content to prevent spinner
+                    # from appearing on the same line as previous output
+                    if self.console.is_terminal:
+                        sys.stdout.write(_CLEAR_LINE)
+                        sys.stdout.flush()
+                except Exception:
+                    pass
                 self.start()

ripperdoc/cli/ui/thinking_spinner.py

@@ -22,7 +22,6 @@ THINKING_WORDS: list[str] = [
     "Cerebrating",
     "Channelling",
     "Churning",
-    "Clauding",
     "Coalescing",
     "Cogitating",
     "Computing",
@@ -114,7 +113,7 @@ class ThinkingSpinner(Spinner):
 
     def _format_text(self, suffix: Optional[str] = None) -> str:
         elapsed = int(time.monotonic() - self.start_time)
-        base = f"✽ {self.thinking_word}… (esc to interrupt · {elapsed}s"
+        base = f" {self.thinking_word}… (esc to interrupt · {elapsed}s"
         if self.out_tokens > 0:
             base += f" · ↓ {self.out_tokens} tokens"
         else:

ripperdoc/cli/ui/tool_renderers.py

@@ -43,7 +43,7 @@ class TodoResultRenderer(ToolResultRenderer):
         if lines:
             self.console.print(f"  ⎿  [dim]{escape(lines[0])}[/]")
             for line in lines[1:]:
-                self.console.print(f"      {line}", markup=False)
+                self.console.print(f"    {line}", markup=False)
         else:
             self.console.print("  ⎿  [dim]Todo update[/]")
 
@@ -107,7 +107,7 @@ class GlobResultRenderer(ToolResultRenderer):
         if self.verbose:
             for line in files[:30]:
                 if line.strip():
-                    self.console.print(f"      {line}", markup=False)
+                    self.console.print(f"    {line}", markup=False)
             if file_count > 30:
                 self.console.print(f"[dim]... ({file_count - 30} more)[/]")
 
@@ -125,7 +125,7 @@ class GrepResultRenderer(ToolResultRenderer):
         if self.verbose:
             for line in matches[:30]:
                 if line.strip():
-                    self.console.print(f"      {line}", markup=False)
+                    self.console.print(f"    {line}", markup=False)
             if match_count > 30:
                 self.console.print(f"[dim]... ({match_count - 30} more)[/]")
 
@@ -142,7 +142,7 @@ class LSResultRenderer(ToolResultRenderer):
         if self.verbose:
             preview = tree_lines[:40]
             for line in preview:
-                self.console.print(f"      {line}", markup=False)
+                self.console.print(f"    {line}", markup=False)
             if len(tree_lines) > len(preview):
                 self.console.print(f"[dim]... ({len(tree_lines) - len(preview)} more)[/]")
 
@@ -193,7 +193,8 @@ class BashResultRenderer(ToolResultRenderer):
             preview = stdout_lines if self.verbose else stdout_lines[:5]
             self.console.print(f"  ⎿  {preview[0]}", markup=False)
             for line in preview[1:]:
-                self.console.print(f"      {line}", markup=False)
+                # Use consistent 4-space indent to match the ⎿ prefix width
+                self.console.print(f"    {line}", markup=False)
             if not self.verbose and len(stdout_lines) > len(preview):
                 self.console.print(f"[dim]... ({len(stdout_lines) - len(preview)} more lines)[/]")
         else:
@@ -229,28 +230,28 @@ class BashResultRenderer(ToolResultRenderer):
             preview = stdout_lines if self.verbose else stdout_lines[:5]
             self.console.print("[dim]stdout:[/]")
             for line in preview:
-                self.console.print(f"      {line}", markup=False)
+                self.console.print(f"    {line}", markup=False)
             if not self.verbose and len(stdout_lines) > len(preview):
                 self.console.print(
                     f"[dim]... ({len(stdout_lines) - len(preview)} more stdout lines)[/]"
                 )
         else:
             self.console.print("[dim]stdout:[/]")
-            self.console.print("      [dim](no stdout)[/]")
+            self.console.print("    [dim](no stdout)[/]")
 
         # Render stderr
         if stderr_lines:
             preview = stderr_lines if self.verbose else stderr_lines[:5]
             self.console.print("[dim]stderr:[/]")
             for line in preview:
-                self.console.print(f"      {line}", markup=False)
+                self.console.print(f"    {line}", markup=False)
             if not self.verbose and len(stderr_lines) > len(preview):
                 self.console.print(
                     f"[dim]... ({len(stderr_lines) - len(preview)} more stderr lines)[/]"
                 )
         else:
             self.console.print("[dim]stderr:[/]")
-            self.console.print("      [dim](no stderr)[/]")
+            self.console.print("    [dim](no stderr)[/]")
 
 
 class ToolResultRendererRegistry:

ripperdoc/cli/ui/wizard.py

@@ -2,6 +2,7 @@
 Interactive onboarding wizard for Ripperdoc.
 """
 
+import os
 from typing import List, Optional, Tuple
 
 import click
@@ -46,6 +47,17 @@ def check_onboarding() -> bool:
     if config.has_completed_onboarding:
         return True
 
+    # 检查是否有有效的 RIPPERDOC_* 环境变量配置
+    # 如果设置了 RIPPERDOC_BASE_URL，可以跳过 onboarding
+    # 不写入配置文件，只在内存中处理
+    if os.getenv("RIPPERDOC_BASE_URL"):
+        # 在内存中标记已完成 onboarding，但不保存到配置文件
+        # 这样下次启动时如果环境变量存在仍然可以工作
+        config.has_completed_onboarding = True
+        config.last_onboarding_version = get_version()
+        save_global_config(config)
+        return True
+
     console.print("[bold cyan]Welcome to Ripperdoc![/bold cyan]\n")
     console.print("Let's set up your AI model configuration.\n")
 
@@ -93,14 +105,12 @@ def run_onboarding_wizard(config: GlobalConfig) -> bool:
             model_suggestions=(),
         )
     else:
-        provider_option = KNOWN_PROVIDERS.get(provider_choice)
-        if provider_option is None:
-            provider_option = ProviderOption(
-                key=provider_choice,
-                protocol=ProviderType.OPENAI_COMPATIBLE,
-                default_model=default_model_for_protocol(ProviderType.OPENAI_COMPATIBLE),
-                model_suggestions=(),
-            )
+        provider_option = KNOWN_PROVIDERS.get(provider_choice) or ProviderOption(
+            key=provider_choice,
+            protocol=ProviderType.OPENAI_COMPATIBLE,
+            default_model=default_model_for_protocol(ProviderType.OPENAI_COMPATIBLE),
+            model_suggestions=(),
+        )
 
     api_key = ""
     while not api_key:
@@ -137,7 +147,7 @@ def get_model_name_with_suggestions(
     api_base_override: Optional[str],
 ) -> Tuple[str, Optional[str]]:
     """Get model name with provider-specific suggestions and default API base.
-    
+
     Returns:
         Tuple of (model_name, api_base)
     """
@@ -154,7 +164,7 @@ def get_model_name_with_suggestions(
     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(f"  [dim]{i + 1}. {model_name}[/dim]")
         console.print("")
 
     # Prompt for model name
@@ -164,16 +174,12 @@ def get_model_name_with_suggestions(
         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_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_input = click.prompt("API base URL (optional)", default="", show_default=False)
             api_base = api_base_input or None
     else:
         model = click.prompt("Model name", default=default_model)
@@ -193,9 +199,7 @@ def get_context_window() -> Optional[int]:
         try:
             context_window = int(context_window_input.strip())
         except ValueError:
-            console.print(
-                "[yellow]Invalid context window, using auto-detected defaults.[/yellow]"
-            )
+            console.print("[yellow]Invalid context window, using auto-detected defaults.[/yellow]")
     return context_window
 
 
@@ -203,6 +207,7 @@ def get_version() -> str:
     """Get current version of Ripperdoc."""
     try:
         from ripperdoc import __version__
+
         return __version__
     except ImportError:
         return "unknown"

ripperdoc/core/agents.py

@@ -10,6 +10,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple
 
 import yaml
 
+from ripperdoc.utils.coerce import parse_boolish
 from ripperdoc.utils.log import get_logger
 from ripperdoc.tools.ask_user_question_tool import AskUserQuestionTool
 from ripperdoc.tools.bash_output_tool import BashOutputTool
@@ -23,8 +24,10 @@ from ripperdoc.tools.glob_tool import GlobTool
 from ripperdoc.tools.grep_tool import GrepTool
 from ripperdoc.tools.kill_bash_tool import KillBashTool
 from ripperdoc.tools.ls_tool import LSTool
+from ripperdoc.tools.lsp_tool import LspTool
 from ripperdoc.tools.multi_edit_tool import MultiEditTool
 from ripperdoc.tools.notebook_edit_tool import NotebookEditTool
+from ripperdoc.tools.skill_tool import SkillTool
 from ripperdoc.tools.todo_tool import TodoReadTool, TodoWriteTool
 from ripperdoc.tools.tool_search_tool import ToolSearchTool
 from ripperdoc.tools.mcp_tools import (
@@ -65,6 +68,8 @@ TOOL_SEARCH_TOOL_NAME = _safe_tool_name(ToolSearchTool, "ToolSearch")
 MCP_LIST_SERVERS_TOOL_NAME = _safe_tool_name(ListMcpServersTool, "ListMcpServers")
 MCP_LIST_RESOURCES_TOOL_NAME = _safe_tool_name(ListMcpResourcesTool, "ListMcpResources")
 MCP_READ_RESOURCE_TOOL_NAME = _safe_tool_name(ReadMcpResourceTool, "ReadMcpResource")
+LSP_TOOL_NAME = _safe_tool_name(LspTool, "LSP")
+SKILL_TOOL_NAME = _safe_tool_name(SkillTool, "Skill")
 TASK_TOOL_NAME = "Task"
 
 
@@ -91,6 +96,7 @@ class AgentDefinition:
     model: Optional[str] = None
     color: Optional[str] = None
     filename: Optional[str] = None
+    fork_context: bool = False
 
 
 @dataclass
@@ -234,7 +240,7 @@ def _built_in_agents() -> List[AgentDefinition]:
             system_prompt=EXPLORE_AGENT_PROMPT,
             location=AgentLocation.BUILT_IN,
             color="green",
-            model="task",
+            model="main",
         ),
         AgentDefinition(
             agent_type="plan",
@@ -324,8 +330,9 @@ def _parse_agent_file(
         return None, f"Failed to read agent file {path}: {exc}"
 
     frontmatter, body = _split_frontmatter(text)
-    if "__error__" in frontmatter:
-        return None, str(frontmatter["__error__"])
+    error = frontmatter.get("__error__")
+    if error is not None:
+        return None, str(error)
 
     agent_name = frontmatter.get("name")
     description = frontmatter.get("description")
@@ -339,6 +346,7 @@ def _parse_agent_file(
     color_value = frontmatter.get("color")
     model = model_value if isinstance(model_value, str) else None
     color = color_value if isinstance(color_value, str) else None
+    fork_context = parse_boolish(frontmatter.get("fork_context") or frontmatter.get("fork-context"))
 
     agent = AgentDefinition(
         agent_type=agent_name.strip(),
@@ -349,6 +357,7 @@ def _parse_agent_file(
         model=model,
         color=color,
         filename=path.stem,
+        fork_context=fork_context,
     )
     return agent, None
 
@@ -404,6 +413,8 @@ def summarize_agent(agent: AgentDefinition) -> str:
     tool_label = "all tools" if "*" in agent.tools else ", ".join(agent.tools)
     location = getattr(agent.location, "value", agent.location)
     details = [f"tools: {tool_label}"]
+    if agent.fork_context:
+        details.append("context: forked")
     if agent.model:
         details.append(f"model: {agent.model}")
     return f"- {agent.agent_type} ({location}): {agent.when_to_use} [{'; '.join(details)}]"