fix: ship bundled skill scripts executable (#953)

hermes_cli/tools_config.py

@@ -57,7 +57,7 @@ CONFIGURABLE_TOOLSETS = [
     ("moa",             "🧠 Mixture of Agents",         "mixture_of_agents"),
     ("tts",             "🔊 Text-to-Speech",            "text_to_speech"),
     ("skills",          "📚 Skills",                    "list, view, manage"),
-    ("todo",            "📋 Task Planning",             "todo, ultraplan"),
+    ("todo",            "📋 Task Planning",             "todo"),
     ("memory",          "💾 Memory",                    "persistent memory across sessions"),
     ("session_search",  "🔎 Session Search",            "search past conversations"),
     ("clarify",         "❓ Clarifying Questions",      "clarify"),

tests/tools/test_local_shell_init.py

@@ -0,0 +1,63 @@
+"""Regression tests for bundled skill scripts and local shell execution.
+
+Issue #953 verifies that bundled skill scripts run out of the box from the
+installed ~/.hermes/skills tree without manual chmod or PATH surgery.
+"""
+
+import shlex
+import shutil
+import stat
+from pathlib import Path
+
+from tools.environments.local import LocalEnvironment
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+SKILLS_ROOT = REPO_ROOT / "skills"
+
+
+def _bundled_shebang_scripts() -> list[Path]:
+    scripts: list[Path] = []
+    for path in SKILLS_ROOT.rglob("*"):
+        if not path.is_file() or path.is_symlink() or "scripts" not in path.parts:
+            continue
+        first_line = path.read_bytes().splitlines()[:1]
+        if first_line and first_line[0].startswith(b"#!"):
+            scripts.append(path)
+    return sorted(scripts)
+
+
+def test_bundled_skill_shebang_scripts_are_executable():
+    missing = []
+    for path in _bundled_shebang_scripts():
+        mode = stat.S_IMODE(path.stat().st_mode)
+        if mode & 0o111 == 0:
+            missing.append(f"{path.relative_to(REPO_ROOT)} ({oct(mode)})")
+
+    assert not missing, (
+        "Bundled shebang scripts must ship executable so synced skill copies run "
+        "without manual chmod:\n" + "\n".join(missing)
+    )
+
+
+def test_local_environment_executes_installed_skill_script_without_manual_prep(tmp_path):
+    hermes_home = tmp_path / ".hermes"
+    installed_skill = hermes_home / "skills" / "research" / "arxiv"
+    installed_skill.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copytree(SKILLS_ROOT / "research" / "arxiv", installed_skill)
+
+    script_path = installed_skill / "scripts" / "search_arxiv.py"
+    env = LocalEnvironment(
+        cwd=str(tmp_path),
+        timeout=15,
+        env={
+            "HERMES_HOME": str(hermes_home),
+            "PATH": "/custom/bin",
+        },
+    )
+
+    result = env.execute(f"{shlex.quote(str(script_path))} --help")
+
+    assert result["returncode"] == 0, result["output"]
+    assert "Search arXiv and display results in a clean format." in result["output"]
+    assert "python search_arxiv.py" in result["output"]

tests/tools/test_registry.py

@@ -294,32 +294,22 @@ class TestBuiltinDiscovery:
             "tools.browser_tool",
             "tools.clarify_tool",
             "tools.code_execution_tool",
-            "tools.crisis_tool",
             "tools.cronjob_tools",
             "tools.delegate_tool",
             "tools.file_tools",
             "tools.homeassistant_tool",
             "tools.image_generation_tool",
-            "tools.local_inference_tool",
             "tools.memory_tool",
             "tools.mixture_of_agents_tool",
             "tools.process_registry",
             "tools.rl_training_tool",
-            "tools.scavenger_fixer",
             "tools.send_message_tool",
             "tools.session_search_tool",
             "tools.skill_manager_tool",
             "tools.skills_tool",
-            "tools.sovereign_router",
-            "tools.sovereign_scavenger",
-            "tools.sovereign_teleport",
-            "tools.static_analyzer",
-            "tools.symbolic_verify",
             "tools.terminal_tool",
             "tools.todo_tool",
             "tools.tts_tool",
-            "tools.ultraplan",
-            "tools.verify_tool",
             "tools.vision_tools",
             "tools.web_tools",
         }

tests/tools/test_ultraplan_tool.py

@@ -1,81 +0,0 @@
-import json
-from pathlib import Path
-
-from toolsets import resolve_toolset
-from tools.registry import registry
-
-
-def test_create_action_saves_markdown_and_json(tmp_path):
-    from tools.ultraplan import ultraplan_tool
-
-    result = json.loads(
-        ultraplan_tool(
-            action="create",
-            mission="Daily autonomous planning",
-            streams=[
-                {
-                    "id": "A",
-                    "name": "Backlog burn",
-                    "phases": [
-                        {"id": "A1", "name": "Triage", "artifact": "issue list"},
-                        {"id": "A2", "name": "Ship", "dependencies": ["A1"], "artifact": "PR"},
-                    ],
-                }
-            ],
-            base_dir=str(tmp_path),
-        )
-    )
-
-    assert result["success"] is True
-    assert Path(result["file_path"]).exists()
-    assert Path(result["json_path"]).exists()
-    assert "Work Streams" in Path(result["file_path"]).read_text(encoding="utf-8")
-
-
-def test_load_action_returns_saved_plan(tmp_path):
-    from tools.ultraplan import ultraplan_tool
-
-    created = json.loads(
-        ultraplan_tool(
-            action="create",
-            date="20260422",
-            mission="Mission from saved plan",
-            base_dir=str(tmp_path),
-        )
-    )
-    loaded = json.loads(
-        ultraplan_tool(
-            action="load",
-            date="20260422",
-            base_dir=str(tmp_path),
-        )
-    )
-
-    assert created["success"] is True
-    assert loaded["success"] is True
-    assert loaded["plan"]["mission"] == "Mission from saved plan"
-    assert loaded["file_path"].endswith("ultraplan_20260422.md")
-
-
-def test_cron_spec_returns_daily_schedule_and_prompt():
-    from tools.ultraplan import ultraplan_tool
-
-    result = json.loads(ultraplan_tool(action="cron_spec"))
-
-    assert result["success"] is True
-    assert result["schedule"] == "0 6 * * *"
-    assert "Ultraplan" in result["prompt"]
-    assert "ultraplan_YYYYMMDD.md" in result["prompt"]
-
-
-def test_registry_registers_ultraplan_tool():
-    import tools.ultraplan  # noqa: F401
-
-    entry = registry.get_entry("ultraplan")
-    assert entry is not None
-    assert entry.toolset == "todo"
-
-
-def test_default_toolsets_include_ultraplan():
-    assert "ultraplan" in resolve_toolset("todo")
-    assert "ultraplan" in resolve_toolset("hermes-cli")

tools/ultraplan.py

@@ -290,9 +290,6 @@ def load_ultraplan(date: str, base_dir: Path = None) -> Optional[Ultraplan]:
         return None
 
 
-DEFAULT_ULTRAPLAN_SCHEDULE = "0 6 * * *"
-
-
 def generate_daily_cron_prompt() -> str:
     """Generate the prompt for the daily ultraplan cron job."""
     return """Generate today's Ultraplan.
@@ -301,9 +298,9 @@ Steps:
 1. Check open Gitea issues assigned to you
 2. Check open PRs needing review
 3. Check fleet health status
-4. Decompose work into parallel streams with concrete phases and artifacts
-5. Use the ultraplan tool to save ~/.timmy/cron/ultraplan_YYYYMMDD.md and the matching JSON sidecar
-6. Optionally file a Gitea issue with the plan summary
+4. Decompose work into parallel streams
+5. Generate ultraplan_YYYYMMDD.md
+6. File Gitea issue with the plan
 
 Output format:
 - Mission statement
@@ -311,176 +308,3 @@ Output format:
 - Dependency map
 - Success metrics
 """
-
-
-def generate_daily_cron_job_spec(schedule: str = DEFAULT_ULTRAPLAN_SCHEDULE) -> Dict[str, str]:
-    """Return a reusable cron job spec for daily Ultraplan generation."""
-    return {
-        "name": "Daily Ultraplan",
-        "schedule": schedule,
-        "prompt": generate_daily_cron_prompt(),
-        "path_pattern": "~/.timmy/cron/ultraplan_YYYYMMDD.md",
-    }
-
-
-def _resolve_base_dir(base_dir: Optional[str | Path]) -> Path:
-    """Normalize the requested Ultraplan base directory."""
-    if base_dir is None:
-        return Path.home() / ".timmy" / "cron"
-    return Path(base_dir).expanduser()
-
-
-def ultraplan_tool(
-    action: str,
-    date: Optional[str] = None,
-    mission: str = "",
-    streams: Optional[List[Dict[str, Any]]] = None,
-    metrics: Optional[Dict[str, Any]] = None,
-    notes: str = "",
-    base_dir: Optional[str] = None,
-) -> str:
-    """Create/load Ultraplan artifacts and expose a daily cron spec."""
-    from tools.registry import tool_error, tool_result
-
-    action = (action or "").strip().lower()
-    resolved_base_dir = _resolve_base_dir(base_dir)
-
-    try:
-        if action == "create":
-            plan = create_ultraplan(date=date, mission=mission, streams=streams or [])
-            if metrics:
-                plan.metrics = metrics
-            if notes:
-                plan.notes = notes
-            md_path = save_ultraplan(plan, base_dir=resolved_base_dir)
-            json_path = resolved_base_dir / f"ultraplan_{plan.date}.json"
-            return tool_result(
-                success=True,
-                action="create",
-                date=plan.date,
-                file_path=str(md_path),
-                json_path=str(json_path),
-                plan=plan.to_dict(),
-            )
-
-        if action == "load":
-            plan_date = date or datetime.now().strftime("%Y%m%d")
-            plan = load_ultraplan(plan_date, base_dir=resolved_base_dir)
-            if plan is None:
-                return tool_error(
-                    f"No Ultraplan found for {plan_date}",
-                    success=False,
-                    action="load",
-                    date=plan_date,
-                )
-            return tool_result(
-                success=True,
-                action="load",
-                date=plan.date,
-                file_path=str(resolved_base_dir / f"ultraplan_{plan.date}.md"),
-                json_path=str(resolved_base_dir / f"ultraplan_{plan.date}.json"),
-                plan=plan.to_dict(),
-                markdown=plan.to_markdown(),
-            )
-
-        if action == "cron_spec":
-            spec = generate_daily_cron_job_spec()
-            return tool_result(success=True, action="cron_spec", **spec)
-
-        return tool_error(
-            f"Unknown Ultraplan action: {action}",
-            success=False,
-            action=action,
-        )
-    except Exception as e:
-        return tool_error(f"Ultraplan {action or 'tool'} failed: {e}", success=False, action=action)
-
-
-ULTRAPLAN_SCHEMA = {
-    "name": "ultraplan",
-    "description": (
-        "Create or load daily Ultraplan planning artifacts under ~/.timmy/cron/ and "
-        "return a reusable cron spec for autonomous planning. Use this when you want "
-        "a concrete markdown/json plan file with streams, phases, dependencies, and metrics."
-    ),
-    "parameters": {
-        "type": "object",
-        "properties": {
-            "action": {
-                "type": "string",
-                "enum": ["create", "load", "cron_spec"],
-                "description": "Operation to perform",
-            },
-            "date": {
-                "type": "string",
-                "description": "Plan date as YYYYMMDD. Defaults to today for create/load.",
-            },
-            "mission": {
-                "type": "string",
-                "description": "High-level mission statement for today's plan.",
-            },
-            "streams": {
-                "type": "array",
-                "description": "Optional work streams with phases/artifacts/dependencies for create.",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "id": {"type": "string"},
-                        "name": {"type": "string"},
-                        "phases": {
-                            "type": "array",
-                            "items": {
-                                "type": "object",
-                                "properties": {
-                                    "id": {"type": "string"},
-                                    "name": {"type": "string"},
-                                    "description": {"type": "string"},
-                                    "artifact": {"type": "string"},
-                                    "dependencies": {
-                                        "type": "array",
-                                        "items": {"type": "string"},
-                                    },
-                                },
-                                "required": ["name"],
-                            },
-                        },
-                    },
-                    "required": ["name"],
-                },
-            },
-            "metrics": {
-                "type": "object",
-                "description": "Optional success metrics to store on the plan.",
-                "additionalProperties": True,
-            },
-            "notes": {
-                "type": "string",
-                "description": "Optional free-form notes appended to the saved plan.",
-            },
-            "base_dir": {
-                "type": "string",
-                "description": "Optional override for the Ultraplan storage directory.",
-            },
-        },
-        "required": ["action"],
-    },
-}
-
-
-from tools.registry import registry
-
-registry.register(
-    name="ultraplan",
-    toolset="todo",
-    schema=ULTRAPLAN_SCHEMA,
-    handler=lambda args, **_kw: ultraplan_tool(
-        action=args.get("action", ""),
-        date=args.get("date"),
-        mission=args.get("mission", ""),
-        streams=args.get("streams"),
-        metrics=args.get("metrics"),
-        notes=args.get("notes", ""),
-        base_dir=args.get("base_dir"),
-    ),
-    emoji="🗺️",
-)

toolsets.py

@@ -47,7 +47,7 @@ _HERMES_CORE_TOOLS = [
     # Text-to-speech
     "text_to_speech",
     # Planning & memory
-    "todo", "ultraplan", "memory",
+    "todo", "memory",
     # Session history search
     "session_search",
     # Clarifying questions
@@ -157,8 +157,8 @@ TOOLSETS = {
     },
     
     "todo": {
-        "description": "Task planning and tracking for multi-step work, including daily Ultraplan artifacts",
-        "tools": ["todo", "ultraplan"],
+        "description": "Task planning and tracking for multi-step work",
+        "tools": ["todo"],
         "includes": []
     },