EvoScientist 0.0.1.dev2__tar.gz → 0.0.1.dev3__tar.gz

{evoscientist-0.0.1.dev2 → evoscientist-0.0.1.dev3}/EvoScientist/EvoScientist.py

@@ -22,10 +22,16 @@ from deepagents.backends import FilesystemBackend, CompositeBackend
 from langchain.chat_models import init_chat_model
 
 from .backends import CustomSandboxBackend, MergedReadOnlyBackend
-from .middleware import create_skills_middleware
+from .middleware import create_skills_middleware, create_memory_middleware
 from .prompts import RESEARCHER_INSTRUCTIONS, get_system_prompt
 from .utils import load_subagents
-from .tools import tavily_search, think_tool
+from .tools import tavily_search, think_tool, skill_manager
+from .paths import (
+    ensure_dirs,
+    default_workspace_dir,
+    MEMORY_DIR as _MEMORY_DIR_PATH,
+    USER_SKILLS_DIR as _USER_SKILLS_DIR_PATH,
+)
 
 # =============================================================================
 # Configuration
@@ -39,8 +45,11 @@ MAX_CONCURRENT = 3  # Max parallel sub-agents
 MAX_ITERATIONS = 3  # Max delegation rounds
 
 # Workspace settings
-WORKSPACE_DIR = "./workspace/"
+ensure_dirs()
+WORKSPACE_DIR = str(default_workspace_dir())
+MEMORY_DIR = str(_MEMORY_DIR_PATH)  # Shared across sessions (not per-session)
 SKILLS_DIR = str(Path(__file__).parent / "skills")
+USER_SKILLS_DIR = str(_USER_SKILLS_DIR_PATH)
 SUBAGENTS_CONFIG = Path(__file__).parent / "subagent.yaml"
 
 # =============================================================================
@@ -76,16 +85,25 @@ else:
         virtual_mode=True,
     )
 
-# Skills backend: merge user-installed (workspace) and system (package) skills
+# Skills backend: merge user-installed (./skills/) and system (package) skills
 _skills_backend = MergedReadOnlyBackend(
-    primary_dir=str(Path(WORKSPACE_DIR) / "skills"),   # user-installed, takes priority
+    primary_dir=USER_SKILLS_DIR,                        # user-installed, takes priority
     secondary_dir=SKILLS_DIR,                           # package built-in, fallback
 )
 
-# Composite backend: workspace as default, skills mounted at /skills/
+# Memory backend: persistent filesystem for long-term memory (shared across sessions)
+_memory_backend = FilesystemBackend(
+    root_dir=MEMORY_DIR,
+    virtual_mode=True,
+)
+
+# Composite backend: workspace as default, skills and memory mounted
 backend = CompositeBackend(
     default=_workspace_backend,
-    routes={"/skills/": _skills_backend},
+    routes={
+        "/skills/": _skills_backend,
+        "/memory/": _memory_backend,
+    },
 )
 
 tool_registry = {
@@ -107,10 +125,13 @@ subagents = load_subagents(
 _AGENT_KWARGS = dict(
     name="EvoScientist",
     model=chat_model,
-    tools=[think_tool],
+    tools=[think_tool, skill_manager],
     backend=backend,
     subagents=subagents,
-    middleware=[create_skills_middleware(SKILLS_DIR, WORKSPACE_DIR)],
+    middleware=[
+        create_memory_middleware(MEMORY_DIR, extraction_model=chat_model),
+        create_skills_middleware(SKILLS_DIR, user_skills_dir=USER_SKILLS_DIR),
+    ],
     system_prompt=SYSTEM_PROMPT,
 )
 
@@ -124,7 +145,7 @@ def create_cli_agent(workspace_dir: str | None = None):
     Args:
         workspace_dir: Optional per-session workspace directory. If provided,
             creates a fresh backend rooted at this path. If None, uses the
-            module-level default backend (./workspace/).
+            module-level default backend (./workspace).
     """
     from langgraph.checkpoint.memory import InMemorySaver  # type: ignore[import-untyped]
 
@@ -135,14 +156,25 @@ def create_cli_agent(workspace_dir: str | None = None):
             timeout=300,
         )
         sk_backend = MergedReadOnlyBackend(
-            primary_dir=str(Path(workspace_dir) / "skills"),
+            primary_dir=USER_SKILLS_DIR,
             secondary_dir=SKILLS_DIR,
         )
+        # Memory always uses SHARED directory (not per-session) for cross-session persistence
+        mem_backend = FilesystemBackend(
+            root_dir=MEMORY_DIR,
+            virtual_mode=True,
+        )
         be = CompositeBackend(
             default=ws_backend,
-            routes={"/skills/": sk_backend},
+            routes={
+                "/skills/": sk_backend,
+                "/memory/": mem_backend,
+            },
         )
-        mw = [create_skills_middleware(SKILLS_DIR, workspace_dir)]
+        mw = [
+            create_memory_middleware(MEMORY_DIR, extraction_model=chat_model),
+            create_skills_middleware(SKILLS_DIR, user_skills_dir=USER_SKILLS_DIR),
+        ]
         kwargs = dict(
             _AGENT_KWARGS,
             backend=be,

evoscientist-0.0.1.dev3/EvoScientist/cli.py

@@ -0,0 +1,427 @@
+"""
+EvoScientist Agent CLI
+
+Command-line interface with streaming output for the EvoScientist research agent.
+
+Features:
+- Thinking panel (blue) - shows model reasoning
+- Tool calls with status indicators (green/yellow/red dots)
+- Tool results in tree format with folding
+- Response panel (green) - shows final response
+- Thread ID support for multi-turn conversations
+- Interactive mode with prompt_toolkit
+"""
+
+import logging
+import os
+import sys
+import uuid
+from datetime import datetime
+from typing import Any, Optional
+
+import typer  # type: ignore[import-untyped]
+from prompt_toolkit import PromptSession  # type: ignore[import-untyped]
+from prompt_toolkit.history import FileHistory  # type: ignore[import-untyped]
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory  # type: ignore[import-untyped]
+from prompt_toolkit.formatted_text import HTML  # type: ignore[import-untyped]
+from rich.text import Text  # type: ignore[import-untyped]
+
+# Backward-compat re-exports (tests import these from EvoScientist.cli)
+from .stream.state import SubAgentState, StreamState, _parse_todo_items, _build_todo_stats  # noqa: F401
+from .stream.display import console, _run_streaming
+from .paths import ensure_dirs, new_run_dir
+
+
+def _shorten_path(path: str) -> str:
+    """Shorten absolute path to relative path from current directory."""
+    if not path:
+        return path
+    try:
+        cwd = os.getcwd()
+        if path.startswith(cwd):
+            # Remove cwd prefix, keep the relative part
+            rel = path[len(cwd):].lstrip(os.sep)
+            # Add current dir name for context
+            return os.path.join(os.path.basename(cwd), rel) if rel else os.path.basename(cwd)
+        return path
+    except Exception:
+        return path
+
+
+# =============================================================================
+# Banner
+# =============================================================================
+
+EVOSCIENTIST_ASCII_LINES = [
+    r" ███████╗ ██╗   ██╗  ██████╗  ███████╗  ██████╗ ██╗ ███████╗ ███╗   ██╗ ████████╗ ██╗ ███████╗ ████████╗",
+    r" ██╔════╝ ██║   ██║ ██╔═══██╗ ██╔════╝ ██╔════╝ ██║ ██╔════╝ ████╗  ██║ ╚══██╔══╝ ██║ ██╔════╝ ╚══██╔══╝",
+    r" █████╗   ██║   ██║ ██║   ██║ ███████╗ ██║      ██║ █████╗   ██╔██╗ ██║    ██║    ██║ ███████╗    ██║   ",
+    r" ██╔══╝   ╚██╗ ██╔╝ ██║   ██║ ╚════██║ ██║      ██║ ██╔══╝   ██║╚██╗██║    ██║    ██║ ╚════██║    ██║   ",
+    r" ███████╗  ╚████╔╝  ╚██████╔╝ ███████║ ╚██████╗ ██║ ███████╗ ██║ ╚████║    ██║    ██║ ███████║    ██║   ",
+    r" ╚══════╝   ╚═══╝    ╚═════╝  ╚══════╝  ╚═════╝ ╚═╝ ╚══════╝ ╚═╝  ╚═══╝    ╚═╝    ╚═╝ ╚══════╝    ╚═╝   ",
+]
+
+# Blue gradient: deep navy -> royal blue -> sky blue -> cyan
+_GRADIENT_COLORS = ["#1a237e", "#1565c0", "#1e88e5", "#42a5f5", "#64b5f6", "#90caf9"]
+
+
+def print_banner(
+    thread_id: str,
+    workspace_dir: str | None = None,
+    memory_dir: str | None = None,
+):
+    """Print welcome banner with ASCII art logo, thread ID, and workspace path."""
+    for line, color in zip(EVOSCIENTIST_ASCII_LINES, _GRADIENT_COLORS):
+        console.print(Text(line, style=f"{color} bold"))
+    info = Text()
+    info.append("  Thread: ", style="dim")
+    info.append(thread_id, style="yellow")
+    if workspace_dir:
+        info.append("\n  Workspace: ", style="dim")
+        info.append(_shorten_path(workspace_dir), style="cyan")
+    if memory_dir:
+        trimmed = memory_dir.rstrip("/").rstrip("\\")
+        info.append("\n  Memory dir: ", style="dim")
+        info.append(_shorten_path(trimmed), style="cyan")
+    info.append("\n  Commands: ", style="dim")
+    info.append("/exit", style="bold")
+    info.append(", ", style="dim")
+    info.append("/new", style="bold")
+    info.append(", ", style="dim")
+    info.append("/thread", style="bold")
+    info.append(", ", style="dim")
+    info.append("/skills", style="bold")
+    info.append(", ", style="dim")
+    info.append("/install-skill", style="bold")
+    info.append(", ", style="dim")
+    info.append("/uninstall-skill", style="bold")
+    console.print(info)
+    console.print()
+
+
+# =============================================================================
+# Skill management commands
+# =============================================================================
+
+
+def _cmd_list_skills() -> None:
+    """List installed user skills."""
+    from .skills_manager import list_skills
+    from .paths import USER_SKILLS_DIR
+
+    skills = list_skills(include_system=False)
+
+    if not skills:
+        console.print("[dim]No user skills installed.[/dim]")
+        console.print(f"[dim]Install with:[/dim] /install-skill <path-or-url>")
+        console.print(f"[dim]Skills directory:[/dim] [cyan]{_shorten_path(str(USER_SKILLS_DIR))}[/cyan]")
+        console.print()
+        return
+
+    console.print(f"[bold]Installed Skills[/bold] ({len(skills)}):")
+    for skill in skills:
+        console.print(f"  [green]{skill.name}[/green] - {skill.description}")
+    console.print(f"\n[dim]Location:[/dim] [cyan]{_shorten_path(str(USER_SKILLS_DIR))}[/cyan]")
+    console.print()
+
+
+def _cmd_install_skill(source: str) -> None:
+    """Install a skill from local path or GitHub URL."""
+    from .skills_manager import install_skill
+
+    if not source:
+        console.print("[red]Usage:[/red] /install-skill <path-or-url>")
+        console.print("[dim]Examples:[/dim]")
+        console.print("  /install-skill ./my-skill")
+        console.print("  /install-skill https://github.com/user/repo/tree/main/skill-name")
+        console.print("  /install-skill user/repo@skill-name")
+        console.print()
+        return
+
+    console.print(f"[dim]Installing skill from:[/dim] {source}")
+
+    result = install_skill(source)
+
+    if result["success"]:
+        console.print(f"[green]Installed:[/green] {result['name']}")
+        console.print(f"[dim]Description:[/dim] {result.get('description', '(none)')}")
+        console.print(f"[dim]Path:[/dim] [cyan]{_shorten_path(result['path'])}[/cyan]")
+        console.print()
+        console.print("[dim]Reload the agent with /new to use the skill.[/dim]")
+    else:
+        console.print(f"[red]Failed:[/red] {result['error']}")
+    console.print()
+
+
+def _cmd_uninstall_skill(name: str) -> None:
+    """Uninstall a user-installed skill."""
+    from .skills_manager import uninstall_skill
+
+    if not name:
+        console.print("[red]Usage:[/red] /uninstall-skill <skill-name>")
+        console.print("[dim]Use /skills to see installed skills.[/dim]")
+        console.print()
+        return
+
+    result = uninstall_skill(name)
+
+    if result["success"]:
+        console.print(f"[green]Uninstalled:[/green] {name}")
+        console.print("[dim]Reload the agent with /new to apply changes.[/dim]")
+    else:
+        console.print(f"[red]Failed:[/red] {result['error']}")
+    console.print()
+
+
+# =============================================================================
+# CLI commands
+# =============================================================================
+
+def cmd_interactive(
+    agent: Any,
+    show_thinking: bool = True,
+    workspace_dir: str | None = None,
+    workspace_fixed: bool = False,
+) -> None:
+    """Interactive conversation mode with streaming output.
+
+    Args:
+        agent: Compiled agent graph
+        show_thinking: Whether to display thinking panels
+        workspace_dir: Per-session workspace directory path
+        workspace_fixed: If True, /new keeps the same workspace directory
+    """
+    thread_id = str(uuid.uuid4())
+    from .EvoScientist import MEMORY_DIR
+    memory_dir = MEMORY_DIR
+    print_banner(thread_id, workspace_dir, memory_dir)
+
+    history_file = str(os.path.expanduser("~/.EvoScientist_history"))
+    session = PromptSession(
+        history=FileHistory(history_file),
+        auto_suggest=AutoSuggestFromHistory(),
+        enable_history_search=True,
+    )
+
+    def _print_separator():
+        """Print a horizontal separator line spanning the terminal width."""
+        width = console.size.width
+        console.print(Text("\u2500" * width, style="dim"))
+
+    _print_separator()
+    while True:
+        try:
+            user_input = session.prompt(
+                HTML('<ansiblue><b>&gt;</b></ansiblue> ')
+            ).strip()
+
+            if not user_input:
+                # Erase the empty prompt line so it looks like nothing happened
+                sys.stdout.write("\033[A\033[2K\r")
+                sys.stdout.flush()
+                continue
+
+            _print_separator()
+
+            # Special commands
+            if user_input.lower() in ("/exit", "/quit", "/q"):
+                console.print("[dim]Goodbye![/dim]")
+                break
+
+            if user_input.lower() == "/new":
+                # New session: new thread; workspace only changes if not fixed
+                if not workspace_fixed:
+                    workspace_dir = _create_session_workspace()
+                console.print("[dim]Loading new session...[/dim]")
+                agent = _load_agent(workspace_dir=workspace_dir)
+                thread_id = str(uuid.uuid4())
+                console.print(f"[green]New session:[/green] [yellow]{thread_id}[/yellow]")
+                if workspace_dir:
+                    console.print(f"[dim]Workspace:[/dim] [cyan]{_shorten_path(workspace_dir)}[/cyan]\n")
+                continue
+
+            if user_input.lower() == "/thread":
+                console.print(f"[dim]Thread:[/dim] [yellow]{thread_id}[/yellow]")
+                if workspace_dir:
+                    console.print(f"[dim]Workspace:[/dim] [cyan]{_shorten_path(workspace_dir)}[/cyan]")
+                if memory_dir:
+                    console.print(f"[dim]Memory dir:[/dim] [cyan]{_shorten_path(memory_dir)}[/cyan]")
+                console.print()
+                continue
+
+            if user_input.lower() == "/skills":
+                _cmd_list_skills()
+                continue
+
+            if user_input.lower().startswith("/install-skill"):
+                source = user_input[len("/install-skill"):].strip()
+                _cmd_install_skill(source)
+                continue
+
+            if user_input.lower().startswith("/uninstall-skill"):
+                name = user_input[len("/uninstall-skill"):].strip()
+                _cmd_uninstall_skill(name)
+                continue
+
+            # Stream agent response
+            console.print()
+            _run_streaming(agent, user_input, thread_id, show_thinking, interactive=True)
+            _print_separator()
+
+        except KeyboardInterrupt:
+            console.print("\n[dim]Goodbye![/dim]")
+            break
+        except Exception as e:
+            console.print(f"[red]Error: {e}[/red]")
+
+
+def cmd_run(agent: Any, prompt: str, thread_id: str | None = None, show_thinking: bool = True, workspace_dir: str | None = None) -> None:
+    """Single-shot execution with streaming display.
+
+    Args:
+        agent: Compiled agent graph
+        prompt: User prompt
+        thread_id: Optional thread ID (generates new one if None)
+        show_thinking: Whether to display thinking panels
+        workspace_dir: Per-session workspace directory path
+    """
+    thread_id = thread_id or str(uuid.uuid4())
+
+    width = console.size.width
+    sep = Text("\u2500" * width, style="dim")
+    console.print(sep)
+    console.print(Text(f"> {prompt}"))
+    console.print(sep)
+    console.print(f"[dim]Thread: {thread_id}[/dim]")
+    if workspace_dir:
+        console.print(f"[dim]Workspace: {_shorten_path(workspace_dir)}[/dim]")
+    console.print()
+
+    try:
+        _run_streaming(agent, prompt, thread_id, show_thinking, interactive=False)
+    except Exception as e:
+        console.print(f"[red]Error: {e}[/red]")
+        raise
+
+
+# =============================================================================
+# Agent loading helpers
+# =============================================================================
+
+def _create_session_workspace() -> str:
+    """Create a per-session workspace directory and return its path."""
+    session_id = datetime.now().strftime("%Y%m%d_%H%M%S")
+    workspace_dir = str(new_run_dir(session_id))
+    os.makedirs(workspace_dir, exist_ok=True)
+    return workspace_dir
+
+
+def _load_agent(workspace_dir: str | None = None):
+    """Load the CLI agent (with InMemorySaver checkpointer for multi-turn).
+
+    Args:
+        workspace_dir: Optional per-session workspace directory.
+    """
+    from .EvoScientist import create_cli_agent
+    return create_cli_agent(workspace_dir=workspace_dir)
+
+
+# =============================================================================
+# Typer app
+# =============================================================================
+
+app = typer.Typer(no_args_is_help=False, add_completion=False)
+
+
+@app.callback(invoke_without_command=True)
+def _main_callback(
+    ctx: typer.Context,
+    prompt: Optional[str] = typer.Argument(None, help="Query to execute (single-shot mode)"),
+    interactive: bool = typer.Option(False, "-i", "--interactive", help="Interactive conversation mode"),
+    thread_id: Optional[str] = typer.Option(None, "--thread-id", help="Thread ID for conversation persistence"),
+    no_thinking: bool = typer.Option(False, "--no-thinking", help="Disable thinking display"),
+    workdir: Optional[str] = typer.Option(None, "--workdir", help="Override workspace directory for this session"),
+    use_cwd: bool = typer.Option(False, "--use-cwd", help="Use current working directory as workspace"),
+):
+    """EvoScientist Agent - AI-powered research & code execution CLI."""
+    from dotenv import load_dotenv  # type: ignore[import-untyped]
+    load_dotenv(override=True)
+
+    show_thinking = not no_thinking
+
+    if workdir and use_cwd:
+        raise typer.BadParameter("Use either --workdir or --use-cwd, not both.")
+
+    ensure_dirs()
+
+    # Resolve workspace directory for this session
+    if use_cwd:
+        workspace_dir = os.getcwd()
+        workspace_fixed = True
+    elif workdir:
+        workspace_dir = os.path.abspath(os.path.expanduser(workdir))
+        os.makedirs(workspace_dir, exist_ok=True)
+        workspace_fixed = True
+    else:
+        workspace_dir = _create_session_workspace()
+        workspace_fixed = False
+
+    # Load agent with session workspace
+    console.print("[dim]Loading agent...[/dim]")
+    agent = _load_agent(workspace_dir=workspace_dir)
+
+    if interactive:
+        cmd_interactive(
+            agent,
+            show_thinking=show_thinking,
+            workspace_dir=workspace_dir,
+            workspace_fixed=workspace_fixed,
+        )
+    elif prompt:
+        cmd_run(agent, prompt, thread_id=thread_id, show_thinking=show_thinking, workspace_dir=workspace_dir)
+    else:
+        # Default: interactive mode
+        cmd_interactive(
+            agent,
+            show_thinking=show_thinking,
+            workspace_dir=workspace_dir,
+            workspace_fixed=workspace_fixed,
+        )
+
+
+def _configure_logging():
+    """Configure logging with warning symbols for better visibility."""
+    from rich.logging import RichHandler
+
+    class DimWarningHandler(RichHandler):
+        """Custom handler that renders warnings in dim style."""
+
+        def emit(self, record: logging.LogRecord) -> None:
+            if record.levelno == logging.WARNING:
+                # Use Rich console to print dim warning
+                msg = record.getMessage()
+                console.print(f"[dim yellow]\u26a0\ufe0f  Warning:[/dim yellow] [dim]{msg}[/dim]")
+            else:
+                super().emit(record)
+
+    # Configure root logger to use our handler for WARNING and above
+    handler = DimWarningHandler(console=console, show_time=False, show_path=False, show_level=False)
+    handler.setLevel(logging.WARNING)
+
+    # Apply to root logger (catches all loggers including deepagents)
+    root_logger = logging.getLogger()
+    # Remove existing handlers to avoid duplicate output
+    for h in root_logger.handlers[:]:
+        root_logger.removeHandler(h)
+    root_logger.addHandler(handler)
+    root_logger.setLevel(logging.WARNING)
+
+
+def main():
+    """CLI entry point — delegates to the Typer app."""
+    _configure_logging()
+    app()
+
+
+if __name__ == "__main__":
+    main()