evo-cli 0.15.2__tar.gz → 0.15.4__tar.gz

{evo_cli-0.15.2 → evo_cli-0.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.15.2
+Version: 0.15.4
 Summary: Evolution CLI - a developer toolbox for setting up dev machines
 Author: maycuatroi
 Project-URL: Homepage, https://github.com/maycuatroi/evo-cli

evo_cli-0.15.4/evo_cli/VERSION

@@ -0,0 +1 @@
+0.15.4

{evo_cli-0.15.2 → evo_cli-0.15.4}/evo_cli/cli.py

@@ -1,6 +1,7 @@
 import rich_click as click
 
 from evo_cli import __version__
+from evo_cli.commands.agent_toy import agent_toy
 from evo_cli.commands.claude_code import setup_claude
 from evo_cli.commands.cloudflare import cfssh
 from evo_cli.commands.cred import cred_group
@@ -51,6 +52,7 @@ def cli():
     """
 
 
+setup_group.add_command(agent_toy)
 setup_group.add_command(setup_claude)
 setup_group.add_command(setup_gh)
 setup_group.add_command(setup_opencode)

evo_cli-0.15.4/evo_cli/commands/agent_toy.py

@@ -0,0 +1,336 @@
+import os
+import re
+import shutil
+from pathlib import Path
+
+import rich_click as click
+from rich.panel import Panel
+from rich.table import Table
+from rich.text import Text
+
+from evo_cli.commands.claude_code import ensure_claude_on_path, is_windows
+from evo_cli.console import CommandError, console, error, info, run_command, step, success, warning
+
+EPILOG = Text.from_markup(
+    "[bold]Examples[/bold]\n\n"
+    "  [cyan]evo setup agent-toy[/cyan]                      install every toy\n"
+    "  [cyan]evo setup agent-toy --list[/cyan]               show the catalogue\n"
+    "  [cyan]evo setup agent-toy plannotator[/cyan]          install a single toy\n"
+    "  [cyan]evo setup agent-toy context-mode agent-skills[/cyan]\n"
+    "  [cyan]evo setup agent-toy plannotator --minimal[/cyan]  binary only, no agent wiring\n"
+    "  [cyan]evo setup agent-toy --scope project[/cyan]      install into the current project"
+)
+
+PLANNOTATOR_INSTALL_SH = "https://plannotator.ai/install.sh"
+PLANNOTATOR_INSTALL_PS1 = "https://plannotator.ai/install.ps1"
+PLANNOTATOR_MARKETPLACE = "backnotprop/plannotator"
+
+CONTEXT_MODE_MARKETPLACE = "mksglu/context-mode"
+
+SKILLFISH_PACKAGE = "skillfish@latest"
+AGENT_SKILLS_REPO = "maycuatroi1/agent-skills"
+
+ENTRY_RE = re.compile(r"^[^\w]*([\w][\w.@/-]*)\s*$")
+
+INSTALLED = "installed"
+PARTIAL = "partial"
+FAILED = "failed"
+
+RESULT_STYLES = {
+    INSTALLED: "[success]installed[/success]",
+    PARTIAL: "[warning]partial[/warning]",
+    FAILED: "[error]failed[/error]",
+}
+
+
+def parse_entries(output):
+    names = []
+    for line in (output or "").splitlines():
+        if ":" in line:
+            continue
+        match = ENTRY_RE.match(line)
+        if match:
+            names.append(match.group(1))
+    return names
+
+
+def claude_entries(*args):
+    result = run_command(["claude", "plugin", *args], capture=True, check=False)
+    return parse_entries(getattr(result, "stdout", ""))
+
+
+def ensure_marketplace(name, source, scope):
+    if name in claude_entries("marketplace", "list"):
+        info(f"Marketplace [accent]{name}[/accent] already configured; refreshing it")
+        run_command(
+            ["claude", "plugin", "marketplace", "update", name],
+            status=f"Updating marketplace {name}",
+            timeout=300,
+            check=False,
+        )
+        return True
+
+    try:
+        run_command(
+            ["claude", "plugin", "marketplace", "add", source, "--scope", scope],
+            status=f"Adding marketplace {source}",
+            timeout=300,
+        )
+    except CommandError as exc:
+        error(f"Could not add marketplace {source}: {exc}")
+        return False
+    return True
+
+
+def ensure_plugin(plugin, marketplace, scope):
+    target = f"{plugin}@{marketplace}"
+
+    if target in claude_entries("list"):
+        info(f"Plugin [accent]{target}[/accent] already installed; updating it")
+        try:
+            run_command(
+                ["claude", "plugin", "update", target, "--scope", scope],
+                status=f"Updating {target}",
+                timeout=600,
+            )
+        except CommandError as exc:
+            warning(f"Could not update {target}: {exc}")
+        return True
+
+    try:
+        run_command(
+            ["claude", "plugin", "install", target, "--scope", scope],
+            status=f"Installing {target}",
+            timeout=600,
+        )
+    except CommandError as exc:
+        error(f"Could not install {target}: {exc}")
+        return False
+
+    success(f"Plugin [accent]{target}[/accent] installed")
+    return True
+
+
+def plannotator_install_command(minimal):
+    if is_windows():
+        if not shutil.which("powershell"):
+            return None
+        script = f"irm {PLANNOTATOR_INSTALL_PS1} | iex"
+        if minimal:
+            script = f"$env:PLANNOTATOR_MINIMAL=1; {script}"
+        return ["powershell", "-NoProfile", "-Command", script]
+
+    if not (shutil.which("curl") and shutil.which("bash")):
+        return None
+    script = f"curl -fsSL {PLANNOTATOR_INSTALL_SH} | bash"
+    if minimal:
+        script += " -s -- --minimal"
+    return ["bash", "-c", script]
+
+
+def plannotator_binary():
+    found = shutil.which("plannotator")
+    if found:
+        return found
+
+    candidates = []
+    if is_windows():
+        local_app = os.environ.get("LOCALAPPDATA")
+        if local_app:
+            candidates.append(Path(local_app) / "plannotator" / "plannotator.exe")
+        candidates.append(Path.home() / ".local" / "bin" / "plannotator.exe")
+    else:
+        candidates.append(Path.home() / ".local" / "bin" / "plannotator")
+
+    for candidate in candidates:
+        if candidate.exists():
+            return str(candidate)
+    return None
+
+
+def run_plannotator_installer(minimal, attempts=2):
+    command = plannotator_install_command(minimal)
+    if command is None:
+        error("No usable installer here: PowerShell (Windows) or curl + bash (POSIX) is required.")
+        return False
+
+    for attempt in range(1, attempts + 1):
+        try:
+            run_command(command, status="Running the plannotator installer", timeout=900)
+            return True
+        except CommandError as exc:
+            if attempt < attempts:
+                warning(f"The plannotator installer failed ({exc}); retrying")
+            else:
+                error(f"The plannotator installer failed: {exc}")
+    return False
+
+
+def install_plannotator(options):
+    plugin_ok = True
+    if options["minimal"]:
+        info("Minimal install: no plugin, skills, hooks or slash commands")
+    elif not options["claude"]:
+        warning("Claude Code is not on PATH; skipping its plugin. Run `evo setup claude` first.")
+        plugin_ok = False
+    else:
+        plugin_ok = ensure_marketplace("plannotator", PLANNOTATOR_MARKETPLACE, options["scope"]) and ensure_plugin(
+            "plannotator", "plannotator", options["scope"]
+        )
+
+    installed = run_plannotator_installer(options["minimal"])
+    if not installed:
+        binary = plannotator_binary()
+        if not binary:
+            return FAILED
+        warning(f"The installer errored but the binary is in place ({binary})")
+        warning("Skills and hooks for the other agents may be missing; re-run to finish them.")
+
+    return INSTALLED if (plugin_ok and installed) else PARTIAL
+
+
+def install_context_mode(options):
+    if not options["claude"]:
+        error("Claude Code is not on PATH; run `evo setup claude` first.")
+        return FAILED
+
+    if not ensure_marketplace("context-mode", CONTEXT_MODE_MARKETPLACE, options["scope"]):
+        return FAILED
+    return INSTALLED if ensure_plugin("context-mode", "context-mode", options["scope"]) else FAILED
+
+
+def install_agent_skills(options):
+    if not shutil.which("npx"):
+        error("npx was not found; install Node.js 18+ and retry.")
+        return FAILED
+
+    command = [
+        "npx",
+        "-y",
+        SKILLFISH_PACKAGE,
+        "add",
+        AGENT_SKILLS_REPO,
+        "--all",
+        "--yes",
+        "--force",
+        "--project" if options["scope"] == "project" else "--global",
+    ]
+    try:
+        run_command(command, status="Installing agent-skills via skillfish", timeout=900)
+    except CommandError as exc:
+        error(f"skillfish failed: {exc}")
+        return FAILED
+
+    success("agent-skills installed")
+    return INSTALLED
+
+
+TOYS = {
+    "plannotator": {
+        "summary": "Browser review surface for plans, diffs and HTML your agent produces",
+        "url": "https://github.com/backnotprop/plannotator",
+        "install": install_plannotator,
+    },
+    "context-mode": {
+        "summary": "Sandboxed command execution and an indexed knowledge base that keep raw output out of context",
+        "url": "https://github.com/mksglu/context-mode",
+        "install": install_context_mode,
+    },
+    "agent-skills": {
+        "summary": "The personal skill library (credentials, slides, gitnexus, life CLI, TTS, ...)",
+        "url": "https://github.com/maycuatroi1/agent-skills",
+        "install": install_agent_skills,
+    },
+}
+
+
+def print_catalogue():
+    table = Table(box=None, pad_edge=False, show_edge=False)
+    table.add_column("Toy", style="accent", no_wrap=True)
+    table.add_column("What it does")
+    table.add_column("Source", style="dim")
+    for name, toy in TOYS.items():
+        table.add_row(name, toy["summary"], toy["url"])
+    console.print()
+    console.print(table)
+    console.print()
+    console.print("Install everything with [accent]evo setup agent-toy[/accent], or name the ones you want.")
+
+
+def print_summary(results, scope):
+    table = Table(box=None, pad_edge=False, show_edge=False)
+    table.add_column("Toy", style="accent", no_wrap=True)
+    table.add_column("Result", no_wrap=True)
+    for name, status in results:
+        table.add_row(name, RESULT_STYLES[status])
+
+    console.print()
+    console.print(table)
+
+    usable = [name for name, status in results if status != FAILED]
+    lines = []
+    if "plannotator" in usable:
+        lines.append("Plannotator opens plans in your browser as soon as your agent proposes one.")
+    if "context-mode" in usable:
+        lines.append("Run [accent]ctx doctor[/accent] inside Claude Code to verify the hooks.")
+    if "agent-skills" in usable:
+        target = "./.claude/skills" if scope == "project" else "~/.claude/skills"
+        lines.append(f"Skills landed in [accent]{target}[/accent].")
+    if lines:
+        lines.append("")
+        lines.append("Restart Claude Code so the new plugins, hooks and skills load.")
+
+    complete = all(status == INSTALLED for _, status in results)
+    console.print(
+        Panel(
+            Text.from_markup("\n".join(lines) if lines else "Nothing was installed."),
+            title="setup agent-toy complete" if complete else "setup agent-toy incomplete",
+            border_style="success" if complete else "warning",
+            expand=False,
+        )
+    )
+
+
+@click.command("agent-toy", epilog=EPILOG)
+@click.argument("names", nargs=-1, metavar="[TOY]...")
+@click.option("--list", "list_only", is_flag=True, help="Show the catalogue and exit.")
+@click.option(
+    "--scope",
+    type=click.Choice(["user", "project", "local"]),
+    default="user",
+    show_default=True,
+    help="Where to install: `user` is machine-wide, `project` scopes to the current repo.",
+)
+@click.option("--minimal", is_flag=True, help="plannotator: install only the binary, no hooks or skills.")
+def agent_toy(names, list_only, scope, minimal):
+    """Install the agent toolbox: plannotator, context-mode and agent-skills.
+
+    Each toy is pulled at its latest version and installed idempotently: a
+    marketplace that is already configured gets refreshed, a plugin that is
+    already installed gets updated, and skills are overwritten in place. Name
+    one or more toys to install a subset, or pass no argument to install all of
+    them. Run with --list to see what is on offer.
+
+    plannotator needs PowerShell (Windows) or curl + bash (POSIX); context-mode
+    and the plannotator plugin need the Claude Code CLI (`evo setup claude`);
+    agent-skills needs Node.js 18+ for npx.
+    """
+    if list_only:
+        print_catalogue()
+        return
+
+    unknown = [name for name in names if name not in TOYS]
+    if unknown:
+        error(f"Unknown toy(s): {', '.join(unknown)}. Run `evo setup agent-toy --list` to see the catalogue.")
+        return
+
+    selected = list(names) or list(TOYS)
+    options = {"scope": scope, "minimal": minimal, "claude": bool(ensure_claude_on_path())}
+
+    results = []
+    for name in selected:
+        step(f"evo setup agent-toy: {name}")
+        info(TOYS[name]["url"])
+        results.append((name, TOYS[name]["install"](options)))
+
+    print_summary(results, scope)

{evo_cli-0.15.2 → evo_cli-0.15.4}/evo_cli/commands/gdrive.py

@@ -466,8 +466,8 @@ def doc_read(target, out_dir, no_images, raw, via_docs_api):
     """Read a Google Doc and write **doc.md** + downloaded **images/**.
 
     `TARGET` is either a Google Docs URL (`https://docs.google.com/document/d/<id>/...`)
-    or a raw document ID. Auth uses the Drive OAuth token saved in
-    `~/.omelet.json` under `rclone.token`, refreshing it automatically when expired.
+    or a raw document ID.     Auth uses the Drive OAuth token saved in
+    `~/.omelet.json` under `google_drive.token`, refreshing it automatically when expired.
 
     Default path: Drive API export to `text/markdown`, then any inline image URLs
     in the markdown are downloaded into `images/` and their references rewritten

{evo_cli-0.15.2 → evo_cli-0.15.4}/evo_cli/credentials/registry.py

@@ -167,9 +167,12 @@ SPECS = [
         "type": "oauth_token",
         "lifetime": "access ~1h, refresh until revoked",
         "description": (
-            "rclone Google Drive remote: OAuth token + root folder. Being replaced by google_drive; "
-            "still active because red-life/packages/core/src/teaching/drive.ts reads it. Do not mark "
-            "deprecated until that consumer migrates - compile would drop the key and break it."
+            "rclone Google Drive remote: OAuth token + root folder. Being replaced by google_drive. "
+            "The in-cluster consumer (red-life/packages/core/src/teaching/drive.ts) now reads "
+            "google_drive; rclone stays active because two sibling repos outside the harness still "
+            "read and refresh it: evo-lms-harness/cli/modules/gdrive.py and "
+            "fu-teching/tools/schedule/drive.py. Do not mark deprecated until both migrate - compile "
+            "would drop the key and break them."
         ),
         "rotate": "evo cred refresh --service rclone (or rclone config reconnect)",
         "oauth": {

{evo_cli-0.15.2 → evo_cli-0.15.4}/evo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.15.2
+Version: 0.15.4
 Summary: Evolution CLI - a developer toolbox for setting up dev machines
 Author: maycuatroi
 Project-URL: Homepage, https://github.com/maycuatroi/evo-cli

{evo_cli-0.15.2 → evo_cli-0.15.4}/evo_cli.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ evo_cli.egg-info/entry_points.txt
 evo_cli.egg-info/requires.txt
 evo_cli.egg-info/top_level.txt
 evo_cli/commands/__init__.py
+evo_cli/commands/agent_toy.py
 evo_cli/commands/claude_code.py
 evo_cli/commands/cloudflare.py
 evo_cli/commands/cred.py
@@ -86,6 +87,7 @@ evo_cli/tts/openai.py
 evo_cli/tts/player.py
 evo_cli/tts/vbee.py
 tests/__init__.py
+tests/test_agent_toy.py
 tests/test_claude_code.py
 tests/test_cli.py
 tests/test_console.py

evo_cli-0.15.4/tests/test_agent_toy.py

@@ -0,0 +1,164 @@
+import pytest
+from click.testing import CliRunner
+
+from evo_cli.cli import cli
+from evo_cli.commands import agent_toy as toy
+from evo_cli.commands.agent_toy import (
+    FAILED,
+    INSTALLED,
+    PARTIAL,
+    TOYS,
+    install_agent_skills,
+    install_context_mode,
+    install_plannotator,
+    parse_entries,
+    plannotator_install_command,
+)
+
+PLUGIN_LIST = """Installed plugins:
+
+  ❯ context-mode@context-mode
+    Version: 1.0.169
+    Scope: user
+    Status: ✔ enabled
+
+  ❯ warp@claude-code-warp
+    Version: 2.2.0
+    Scope: user
+    Status: ✔ enabled
+"""
+
+MARKETPLACE_LIST = """Configured marketplaces:
+
+  ❯ context-mode
+    Source: Git (https://github.com/mksglu/context-mode.git)
+
+  ❯ plannotator
+    Source: GitHub (backnotprop/plannotator)
+"""
+
+
+@pytest.fixture
+def runner():
+    return CliRunner()
+
+
+@pytest.fixture
+def options():
+    return {"scope": "user", "minimal": False, "claude": True}
+
+
+def test_agent_toy_is_registered():
+    assert "agent-toy" in cli.commands["setup"].commands
+
+
+def test_agent_toy_help_runs(runner):
+    result = runner.invoke(cli, ["setup", "agent-toy", "--help"])
+    assert result.exit_code == 0
+    assert "plannotator" in result.output
+
+
+def test_list_shows_every_toy(runner):
+    result = runner.invoke(cli, ["setup", "agent-toy", "--list"])
+    assert result.exit_code == 0
+    for name in TOYS:
+        assert name in result.output
+
+
+def test_unknown_toy_is_rejected(runner, monkeypatch):
+    monkeypatch.setattr(toy, "ensure_claude_on_path", lambda: "/usr/bin/claude")
+    result = runner.invoke(cli, ["setup", "agent-toy", "nope"])
+    assert "Unknown toy" in result.output
+
+
+def test_parse_entries_reads_plugin_names():
+    assert parse_entries(PLUGIN_LIST) == ["context-mode@context-mode", "warp@claude-code-warp"]
+
+
+def test_parse_entries_reads_marketplace_names():
+    assert parse_entries(MARKETPLACE_LIST) == ["context-mode", "plannotator"]
+
+
+def test_plannotator_install_command_posix(monkeypatch):
+    monkeypatch.setattr(toy, "is_windows", lambda: False)
+    monkeypatch.setattr(toy.shutil, "which", lambda name: f"/usr/bin/{name}")
+    assert plannotator_install_command(False) == [
+        "bash",
+        "-c",
+        "curl -fsSL https://plannotator.ai/install.sh | bash",
+    ]
+    assert plannotator_install_command(True)[-1].endswith("| bash -s -- --minimal")
+
+
+def test_plannotator_install_command_windows(monkeypatch):
+    monkeypatch.setattr(toy, "is_windows", lambda: True)
+    monkeypatch.setattr(toy.shutil, "which", lambda name: f"C:\\{name}.exe")
+    command = plannotator_install_command(True)
+    assert command[0] == "powershell"
+    assert "PLANNOTATOR_MINIMAL=1" in command[-1]
+    assert "install.ps1" in command[-1]
+
+
+def test_plannotator_install_command_without_a_shell(monkeypatch):
+    monkeypatch.setattr(toy, "is_windows", lambda: False)
+    monkeypatch.setattr(toy.shutil, "which", lambda name: None)
+    assert plannotator_install_command(False) is None
+
+
+def test_plannotator_is_partial_when_the_installer_fails(monkeypatch, options):
+    monkeypatch.setattr(toy, "ensure_marketplace", lambda *args: True)
+    monkeypatch.setattr(toy, "ensure_plugin", lambda *args: True)
+    monkeypatch.setattr(toy, "run_plannotator_installer", lambda minimal: False)
+    monkeypatch.setattr(toy, "plannotator_binary", lambda: "/usr/local/bin/plannotator")
+    assert install_plannotator(options) == PARTIAL
+
+
+def test_plannotator_fails_when_no_binary_landed(monkeypatch, options):
+    monkeypatch.setattr(toy, "ensure_marketplace", lambda *args: True)
+    monkeypatch.setattr(toy, "ensure_plugin", lambda *args: True)
+    monkeypatch.setattr(toy, "run_plannotator_installer", lambda minimal: False)
+    monkeypatch.setattr(toy, "plannotator_binary", lambda: None)
+    assert install_plannotator(options) == FAILED
+
+
+def test_plannotator_minimal_skips_the_plugin(monkeypatch, options):
+    calls = []
+    monkeypatch.setattr(toy, "ensure_marketplace", lambda *args: calls.append(args) or True)
+    monkeypatch.setattr(toy, "run_plannotator_installer", lambda minimal: True)
+    options["minimal"] = True
+    assert install_plannotator(options) == INSTALLED
+    assert calls == []
+
+
+def test_context_mode_needs_claude(options):
+    options["claude"] = False
+    assert install_context_mode(options) == FAILED
+
+
+def test_context_mode_installs_the_plugin(monkeypatch, options):
+    monkeypatch.setattr(toy, "ensure_marketplace", lambda *args: True)
+    monkeypatch.setattr(toy, "ensure_plugin", lambda *args: True)
+    assert install_context_mode(options) == INSTALLED
+
+
+def test_agent_skills_installs_globally(monkeypatch, options):
+    captured = {}
+    monkeypatch.setattr(toy.shutil, "which", lambda name: f"/usr/bin/{name}")
+    monkeypatch.setattr(toy, "run_command", lambda command, **kwargs: captured.setdefault("command", command))
+    assert install_agent_skills(options) == INSTALLED
+    assert captured["command"][-1] == "--global"
+    assert "maycuatroi1/agent-skills" in captured["command"]
+
+
+def test_agent_skills_scopes_to_the_project(monkeypatch, options):
+    captured = {}
+    monkeypatch.setattr(toy.shutil, "which", lambda name: f"/usr/bin/{name}")
+    monkeypatch.setattr(toy, "run_command", lambda command, **kwargs: captured.setdefault("command", command))
+    options["scope"] = "project"
+    install_agent_skills(options)
+    assert captured["command"][-1] == "--project"
+
+
+def test_agent_skills_needs_npx(monkeypatch, options):
+    monkeypatch.setattr(toy.shutil, "which", lambda name: None)
+    assert install_agent_skills(options) == FAILED

evo_cli-0.15.2/evo_cli/VERSION

@@ -1 +0,0 @@
-0.15.2