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

ripperdoc/cli/commands/agents_cmd.py

@@ -1,4 +1,7 @@
 from rich.markup import escape
+from rich import box
+from rich.panel import Panel
+from rich.table import Table
 
 from ripperdoc.core.agents import (
     AGENT_DIR_NAME,
@@ -8,14 +11,38 @@ from ripperdoc.core.agents import (
     save_agent_definition,
 )
 from ripperdoc.core.config import get_global_config
+from ripperdoc.tools.task_tool import (
+    list_agent_runs,
+    get_agent_run_snapshot,
+    cancel_agent_run,
+)
 from ripperdoc.utils.log import get_logger
 
-from typing import Any
+from typing import Any, Dict
 from .base import SlashCommand
 
 logger = get_logger()
 
 
+def _format_duration(duration_ms: float | None) -> str:
+    if duration_ms is None:
+        return "-"
+    try:
+        duration = float(duration_ms)
+    except (TypeError, ValueError):
+        return "-"
+    if duration < 1000:
+        return f"{int(duration)} ms"
+    seconds = duration / 1000.0
+    if seconds < 60:
+        return f"{seconds:.1f}s"
+    minutes, secs = divmod(int(seconds), 60)
+    if minutes < 60:
+        return f"{minutes}m {secs}s"
+    hours, mins = divmod(minutes, 60)
+    return f"{hours}h {mins}m"
+
+
 def _handle(ui: Any, trimmed_arg: str) -> bool:
     console = ui.console
     tokens = trimmed_arg.split()
@@ -39,18 +66,114 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
             "[bold]/agents delete <name> [location][/bold] — "
             "delete agent (location: user|project, default user)"
         )
+        console.print("[bold]/agents runs[/bold] — list subagent runs")
+        console.print("[bold]/agents show <id>[/bold] — show subagent run details")
+        console.print("[bold]/agents cancel <id>[/bold] — cancel a background subagent run")
         console.print(
             f"[dim]Agent files live in ~/.ripperdoc/{AGENT_DIR_NAME} "
             f"or ./.ripperdoc/{AGENT_DIR_NAME}[/dim]"
         )
         console.print(
-            "[dim]Model can be a profile name or pointer (task/main/etc). Defaults to 'task'.[/dim]"
+            "[dim]Model can be a profile name or pointer (main/quick). Defaults to 'main'.[/dim]"
         )
 
     if subcmd in ("help", "-h", "--help"):
         print_agents_usage()
         return True
 
+    if subcmd in ("runs", "run", "tasks", "status"):
+        console = ui.console
+        run_ids = list_agent_runs()
+        if not run_ids:
+            console.print(
+                Panel("No subagent runs recorded", title="Subagent runs", box=box.ROUNDED)
+            )
+            return True
+
+        table = Table(box=box.SIMPLE_HEAVY, expand=True)
+        table.add_column("ID", style="cyan", no_wrap=True)
+        table.add_column("Status", style="magenta", no_wrap=True)
+        table.add_column("Agent", style="white", no_wrap=True)
+        table.add_column("Duration", style="dim", no_wrap=True)
+        table.add_column("Background", style="dim", no_wrap=True)
+        table.add_column("Result", style="white")
+
+        for run_id in sorted(run_ids):
+            snapshot: Dict[Any, Any] = get_agent_run_snapshot(run_id) or {}
+            result_text = snapshot.get("result_text") or snapshot.get("error") or ""
+            result_preview = result_text if len(result_text) <= 80 else result_text[:77] + "..."
+            table.add_row(
+                escape(run_id),
+                escape(snapshot.get("status") or "unknown"),
+                escape(snapshot.get("agent_type") or "unknown"),
+                _format_duration(snapshot.get("duration_ms")),
+                "yes" if snapshot.get("is_background") else "no",
+                escape(result_preview),
+            )
+
+        console.print(
+            Panel(table, title="Subagent runs", box=box.ROUNDED, padding=(1, 2)),
+            markup=False,
+        )
+        console.print(
+            "[dim]Use /agents show <id> for details or /agents cancel <id> to stop a background run.[/dim]"
+        )
+        return True
+
+    if subcmd in ("show", "info", "details"):
+        if len(tokens) < 2:
+            console.print("[red]Usage: /agents show <id>[/red]")
+            return True
+        run_id = tokens[1]
+        snapshot = get_agent_run_snapshot(run_id)  # type: ignore[assignment]
+        if not snapshot:
+            console.print(f"[red]No subagent run found with id '{escape(run_id)}'.[/red]")
+            return True
+        details = Table(box=box.SIMPLE_HEAVY, show_header=False)
+        details.add_row("ID", escape(run_id))
+        details.add_row("Status", escape(snapshot.get("status") or "unknown"))
+        details.add_row("Agent", escape(snapshot.get("agent_type") or "unknown"))
+        details.add_row("Duration", _format_duration(snapshot.get("duration_ms")))
+        details.add_row("Background", "yes" if snapshot.get("is_background") else "no")
+        if snapshot.get("model_used"):
+            details.add_row("Model", escape(str(snapshot.get("model_used"))))
+        if snapshot.get("tool_use_count"):
+            details.add_row("Tool uses", str(snapshot.get("tool_use_count")))
+        if snapshot.get("missing_tools"):
+            details.add_row("Missing tools", escape(", ".join(snapshot["missing_tools"])))
+        if snapshot.get("error"):
+            details.add_row("Error", escape(str(snapshot.get("error"))))
+        console.print(
+            Panel(details, title=f"Subagent {escape(run_id)}", box=box.ROUNDED, padding=(1, 2)),
+            markup=False,
+        )
+        result_text = snapshot.get("result_text")
+        if result_text:
+            console.print(Panel(escape(result_text), title="Result", box=box.SIMPLE))
+        return True
+
+    if subcmd in ("cancel", "kill", "stop"):
+        if len(tokens) < 2:
+            console.print("[red]Usage: /agents cancel <id>[/red]")
+            return True
+        run_id = tokens[1]
+        runner = getattr(ui, "run_async", None)
+        try:
+            if callable(runner):
+                cancelled = runner(cancel_agent_run(run_id))
+            else:
+                import asyncio
+
+                cancelled = asyncio.run(cancel_agent_run(run_id))
+        except (OSError, RuntimeError, ValueError) as exc:
+            console.print(f"[red]Failed to cancel '{escape(run_id)}': {escape(str(exc))}[/red]")
+            return True
+        if cancelled:
+            console.print(f"[green]Cancelled subagent {escape(run_id)}[/green]")
+        else:
+            console.print(f"[yellow]No running subagent found for '{escape(run_id)}'.[/yellow]")
+        return True
+
     if subcmd in ("create", "add"):
         agent_name = tokens[1] if len(tokens) > 1 else console.input("Agent name: ").strip()
         if not agent_name:
@@ -84,7 +207,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
 
         config = get_global_config()
         pointer_map = config.model_pointers.model_dump()
-        default_model_value = model_arg or pointer_map.get("task", "task")
+        default_model_value = model_arg or pointer_map.get("main", "main")
         model_input = (
             console.input(f"Model profile or pointer [{default_model_value}]: ").strip()
             or default_model_value
@@ -205,7 +328,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
 
         config = get_global_config()
         pointer_map = config.model_pointers.model_dump()
-        model_default = target_agent.model or pointer_map.get("task", "task")
+        model_default = target_agent.model or pointer_map.get("main", "main")
         model_input = (
             console.input(f"Model profile or pointer [{model_default}]: ").strip() or model_default
         )
@@ -245,7 +368,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
         console.print(f"  • {escape(agent.agent_type)} ({escape(str(location))})", markup=False)
         console.print(f"      {escape(agent.when_to_use)}", markup=False)
         console.print(f"      tools: {escape(tools_str)}", markup=False)
-        console.print(f"      model: {escape(agent.model or 'task (default)')}", markup=False)
+        console.print(f"      model: {escape(agent.model or 'main (default)')}", markup=False)
     if agents.failed_files:
         console.print("[yellow]Some agent files could not be loaded:[/yellow]")
         for path, error in agents.failed_files:

ripperdoc/cli/commands/clear_cmd.py

@@ -3,8 +3,16 @@ from .base import SlashCommand
 
 
 def _handle(ui: Any, _: str) -> bool:
+    try:
+        ui._run_session_end("clear")
+    except (AttributeError, RuntimeError, ValueError):
+        pass
     ui.conversation_messages = []
     ui.console.print("[green]✓ Conversation cleared[/green]")
+    try:
+        ui._run_session_start("clear")
+    except (AttributeError, RuntimeError, ValueError):
+        pass
     return True
 
 

ripperdoc/cli/commands/doctor_cmd.py

@@ -15,6 +15,8 @@ from ripperdoc.core.config import (
     api_key_env_candidates,
     get_global_config,
     get_project_config,
+    get_ripperdoc_env_status,
+    has_ripperdoc_env_overrides,
 )
 from ripperdoc.cli.ui.helpers import get_profile_for_pointer
 from ripperdoc.utils.log import get_logger
@@ -41,6 +43,12 @@ def _api_key_status(provider: ProviderType, profile_key: Optional[str]) -> Tuple
     """Check API key presence and source."""
     import os
 
+    # 首先检查全局 RIPPERDOC_API_KEY
+    if ripperdoc_api_key := os.getenv("RIPPERDOC_API_KEY"):
+        masked = ripperdoc_api_key[:4] + "…" if len(ripperdoc_api_key) > 4 else "set"
+        return ("ok", f"Found in $RIPPERDOC_API_KEY ({masked})")
+
+    # 然后检查 provider 特定的环境变量
     for env_var in api_key_env_candidates(provider):
         if os.environ.get(env_var):
             masked = os.environ[env_var]
@@ -186,6 +194,23 @@ def _project_status(project_path: Path) -> Tuple[str, str, str]:
         )
 
 
+def _ripperdoc_env_status() -> List[Tuple[str, str, str]]:
+    """Check RIPPERDOC_* environment variable overrides."""
+    rows: List[Tuple[str, str, str]] = []
+
+    if not has_ripperdoc_env_overrides():
+        rows.append(_status_row("Env overrides", "ok", "No RIPPERDOC_* overrides active"))
+        return rows
+
+    rows.append(_status_row("Env overrides", "ok", "RIPPERDOC_* variables detected"))
+
+    status = get_ripperdoc_env_status()
+    for key, value in status.items():
+        rows.append(_status_row("", "ok", f"  {key}: {value}"))
+
+    return rows
+
+
 def _render_table(console: Any, rows: List[Tuple[str, str, str]]) -> None:
     table = Table(show_header=True, header_style="bold cyan")
     table.add_column("Check")
@@ -202,6 +227,10 @@ def _handle(ui: Any, _: str) -> bool:
 
     results.append(_onboarding_status())
     results.extend(_model_status(project_path))
+
+    # 检查 RIPPERDOC_* 环境变量
+    results.extend(_ripperdoc_env_status())
+
     project_row = _project_status(project_path)
     results.append(project_row)
 

ripperdoc/cli/commands/exit_cmd.py

@@ -4,6 +4,7 @@ from .base import SlashCommand
 
 def _handle(ui: Any, _: str) -> bool:
     ui.console.print("[yellow]Goodbye![/yellow]")
+    ui._exit_reason = "prompt_input_exit"
     ui._should_exit = True
     return True
 

ripperdoc/cli/commands/memory_cmd.py

@@ -18,6 +18,7 @@ from ripperdoc.utils.memory import (
     MEMORY_FILE_NAME,
     collect_all_memory_files,
 )
+from ripperdoc.utils.platform import is_windows
 
 from .base import SlashCommand
 
@@ -89,7 +90,7 @@ def _determine_editor_command() -> Optional[List[str]]:
             return shlex.split(value)
 
     candidates = ["code", "nano", "vim", "vi"]
-    if os.name == "nt":
+    if is_windows():
         candidates.insert(0, "notepad")
 
     for candidate in candidates:

ripperdoc/cli/commands/models_cmd.py

@@ -36,7 +36,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
         console.print("[bold]/models delete <name>[/bold] — delete a model profile")
         console.print("[bold]/models use <name>[/bold] — set the main model pointer")
         console.print(
-            "[bold]/models use <pointer> <name>[/bold] — set a specific pointer (main/task/reasoning/quick)"
+            "[bold]/models use <pointer> <name>[/bold] — set a specific pointer (main/quick)"
         )
 
     def parse_int(prompt_text: str, default_value: Optional[int]) -> Optional[int]:
@@ -155,12 +155,34 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
         context_prompt += "): "
         context_window = parse_int(context_prompt, context_window_default)
 
+        # Vision support prompt
+        supports_vision_default = existing_profile.supports_vision if existing_profile else None
+        supports_vision = None
+        vision_default_display = (
+            "auto"
+            if supports_vision_default is None
+            else ("yes" if supports_vision_default else "no")
+        )
+        supports_vision_input = (
+            console.input(f"Supports vision (images)? [{vision_default_display}] (Y/n/auto): ")
+            .strip()
+            .lower()
+        )
+        if supports_vision_input in ("y", "yes"):
+            supports_vision = True
+        elif supports_vision_input in ("n", "no"):
+            supports_vision = False
+        elif supports_vision_input in ("auto", ""):
+            supports_vision = None
+        else:
+            supports_vision = supports_vision_default
+
         default_set_main = (
             not config.model_profiles
             or getattr(config.model_pointers, "main", "") not in config.model_profiles
         )
         set_main_input = (
-            console.input(f"Set as main model? [{'Y' if default_set_main else 'y'}/N]: ")
+            console.input(f"Set as main model? ({'Y' if default_set_main else 'y'}/N): ")
             .strip()
             .lower()
         )
@@ -175,6 +197,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
             temperature=temperature,
             context_window=context_window,
             auth_token=auth_token,
+            supports_vision=supports_vision,
         )
 
         try:
@@ -276,6 +299,31 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
             existing_profile.context_window,
         )
 
+        # Vision support prompt
+        vision_default_display = (
+            "auto"
+            if existing_profile.supports_vision is None
+            else ("yes" if existing_profile.supports_vision else "no")
+        )
+        supports_vision_input = (
+            console.input(
+                f"Supports vision (images)? [{vision_default_display}] (Y/n/auto/C=clear): "
+            )
+            .strip()
+            .lower()
+        )
+        supports_vision = None
+        if supports_vision_input in ("y", "yes"):
+            supports_vision = True
+        elif supports_vision_input in ("n", "no"):
+            supports_vision = False
+        elif supports_vision_input in ("c", "clear", "-"):
+            supports_vision = None
+        elif supports_vision_input in ("auto", ""):
+            supports_vision = existing_profile.supports_vision
+        else:
+            supports_vision = existing_profile.supports_vision
+
         updated_profile = ModelProfile(
             provider=provider,
             model=model_name,
@@ -285,6 +333,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
             temperature=temperature,
             context_window=context_window,
             auth_token=auth_token,
+            supports_vision=supports_vision,
         )
 
         try:
@@ -331,7 +380,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
 
     if subcmd in ("use", "main", "set-main"):
         # Support both "/models use <profile>" and "/models use <pointer> <profile>"
-        valid_pointers = {"main", "task", "reasoning", "quick"}
+        valid_pointers = {"main", "quick"}
 
         if len(tokens) >= 3:
             # /models use <pointer> <profile>
@@ -353,10 +402,7 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
                 pointer = "main"
                 target = tokens[1]
         else:
-            pointer = (
-                console.input("Pointer (main/task/reasoning/quick) [main]: ").strip().lower()
-                or "main"
-            )
+            pointer = console.input("Pointer (main/quick) [main]: ").strip().lower() or "main"
             if pointer not in valid_pointers:
                 console.print(
                     f"[red]Invalid pointer '{escape(pointer)}'. Valid pointers: {', '.join(valid_pointers)}[/red]"
@@ -415,6 +461,16 @@ def _handle(ui: Any, trimmed_arg: str) -> bool:
             )
         if profile.openai_tool_mode:
             console.print(f"      openai_tool_mode: {profile.openai_tool_mode}", markup=False)
+        if profile.thinking_mode:
+            console.print(f"      thinking_mode: {profile.thinking_mode}", markup=False)
+        # Display vision support
+        if profile.supports_vision is None:
+            vision_display = "auto-detect"
+        elif profile.supports_vision:
+            vision_display = "yes"
+        else:
+            vision_display = "no"
+        console.print(f"      supports_vision: {vision_display}", markup=False)
     pointer_labels = ", ".join(f"{p}->{v or '-'}" for p, v in pointer_map.items())
     console.print(f"[dim]Pointers: {escape(pointer_labels)}[/dim]")
     return True

ripperdoc/cli/commands/resume_cmd.py

@@ -116,6 +116,10 @@ def _handle(ui: Any, arg: str) -> bool:
     ui.conversation_messages = messages
     ui._saved_conversation = None
     ui._set_session(summary.session_id)
+    try:
+        ui._run_session_start("resume")
+    except (AttributeError, RuntimeError, ValueError):
+        pass
     ui.replay_conversation(messages)
     ui.console.print(
         f"[green]✓ Resumed session {escape(summary.session_id)} "
@@ -128,6 +132,7 @@ command = SlashCommand(
     name="resume",
     description="Resume a previous session conversation",
     handler=_handle,
+    aliases=("sessions",),
 )
 
 

ripperdoc/cli/commands/skills_cmd.py

@@ -0,0 +1,103 @@
+from rich.markup import escape
+
+from ripperdoc.core.skills import (
+    SkillDefinition,
+    SkillLoadResult,
+    SkillLocation,
+    load_all_skills,
+    skill_directories,
+)
+
+from typing import Any
+from .base import SlashCommand
+
+
+def _handle(ui: Any, _: str) -> bool:
+    console = ui.console
+    project_path = getattr(ui, "project_path", None)
+
+    result: SkillLoadResult = load_all_skills(project_path=project_path)
+
+    if not result.skills:
+        dirs = skill_directories(project_path=project_path)
+        dir_paths = [f"'{d}'" for d, _ in dirs]
+        console.print("[yellow]No skills found.[/yellow]")
+        console.print(
+            f"\n[bold]Create skills in:[/bold]\n"
+            f"  • User: {dir_paths[0]}\n"
+            f"  • Project: {dir_paths[1]}\n"
+            f"\n[dim]Each skill needs a SKILL.md file with YAML frontmatter:\n"
+            f"---\n"
+            f"name: my-skill\n"
+            f"description: A helpful skill\n"
+            f"---\n\n"
+            f"Skill content goes here...[/dim]"
+        )
+        if result.errors:
+            console.print("\n[bold red]Errors encountered while loading skills:[/bold red]")
+            for error in result.errors:
+                console.print(f"  • {error.path}: {escape(error.reason)}", markup=False)
+        return True
+
+    console.print("\n[bold]Skills[/bold]")
+
+    # Group skills by location for better organization
+    user_skills = [s for s in result.skills if s.location == SkillLocation.USER]
+    project_skills = [s for s in result.skills if s.location == SkillLocation.PROJECT]
+    other_skills = [s for s in result.skills if s.location == SkillLocation.OTHER]
+
+    def print_skill(skill: SkillDefinition) -> None:
+        location_tag = f"[dim]({skill.location.value})[/dim]" if skill.location else ""
+        console.print(f"\n[bold cyan]{escape(skill.name)}[/bold cyan] {location_tag}")
+        console.print(f"  {escape(skill.description)}")
+
+        if skill.allowed_tools:
+            tools_str = ", ".join(escape(t) for t in skill.allowed_tools)
+            console.print(f"  Tools: {tools_str}")
+
+        if skill.model:
+            console.print(f"  Model: {escape(skill.model)}")
+
+        if skill.max_thinking_tokens:
+            console.print(f"  Max thinking tokens: {skill.max_thinking_tokens}")
+
+        if skill.skill_type != "prompt":
+            console.print(f"  Type: {escape(skill.skill_type)}")
+
+        if skill.disable_model_invocation:
+            console.print("  [yellow]Model invocation disabled[/yellow]")
+
+        console.print(f"  Path: {escape(str(skill.path))}", markup=False)
+
+    # Print project skills first (they have priority), then user skills
+    if project_skills:
+        console.print("\n[bold]Project skills:[/bold]")
+        for skill in project_skills:
+            print_skill(skill)
+
+    if user_skills:
+        console.print("\n[bold]User skills:[/bold]")
+        for skill in user_skills:
+            print_skill(skill)
+
+    if other_skills:
+        console.print("\n[bold]Other skills:[/bold]")
+        for skill in other_skills:
+            print_skill(skill)
+
+    if result.errors:
+        console.print("\n[bold red]Errors encountered while loading skills:[/bold red]")
+        for error in result.errors:
+            console.print(f"  • {error.path}: {escape(error.reason)}", markup=False)
+
+    return True
+
+
+command = SlashCommand(
+    name="skills",
+    description="List available skills",
+    handler=_handle,
+)
+
+
+__all__ = ["command"]