mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-28 06:51:16 +08:00
Two related fixes for OpenClaw-residue problems after an OpenClaw→Hermes migration (especially migrations done via OpenClaw's own tool, which doesn't archive the source directory). 1. optional-skills/migration/openclaw-migration/scripts/openclaw_to_hermes.py: rebrand_text() was rewriting ~/.openclaw/config.yaml → ~/.Hermes/config.yaml (capital H — a directory that doesn't exist). Now case-preserving: "OpenClaw" → "Hermes" (prose), but "openclaw" → "hermes" (so filesystem paths land on the real Hermes home). Regex logic unchanged — replacement function now checks if the matched text was all-lowercase and emits the replacement in the matching case. 2. agent/onboarding.py + cli.py: one-time startup banner the first time Hermes launches and finds ~/.openclaw/. Tells the user to run `hermes claw cleanup` to archive it, gated on the existing onboarding seen-flag framework (onboarding.seen.openclaw_residue_cleanup in config.yaml). Fires once per install; re-running requires wiping that flag or running cleanup directly. Tests: - 4 new TestDetectOpenclawResidue tests (present / absent / file-instead- of-dir / default-home smoke) - 2 TestOpenclawResidueHint tests (content check) - 2 TestOpenclawResidueSeenFlag tests (flag isolation + round-trip) - test_rebrand_text_preserves_filesystem_path_casing regression test with 4 scenarios including the exact ~/.openclaw/config.yaml case - Existing test_rebrand_text_* tests updated to the new case-preserving contract (lowercase input → lowercase output) Co-authored-by: teknium1 <teknium@noreply.github.com>
192 lines
7.1 KiB
Python
192 lines
7.1 KiB
Python
"""
|
|
Contextual first-touch onboarding hints.
|
|
|
|
Instead of blocking first-run questionnaires, show a one-time hint the *first*
|
|
time a user hits a behavior fork — message-while-running, first long-running
|
|
tool, etc. Each hint is shown once per install (tracked in ``config.yaml`` under
|
|
``onboarding.seen.<flag>``) and then never again.
|
|
|
|
Keep this module tiny and dependency-free so both the CLI and gateway can import
|
|
it without pulling in heavy modules.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from pathlib import Path
|
|
from typing import Any, Mapping, Optional
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# -------------------------------------------------------------------------
|
|
# Flag names (stable — used as config.yaml keys under onboarding.seen)
|
|
# -------------------------------------------------------------------------
|
|
|
|
BUSY_INPUT_FLAG = "busy_input_prompt"
|
|
TOOL_PROGRESS_FLAG = "tool_progress_prompt"
|
|
OPENCLAW_RESIDUE_FLAG = "openclaw_residue_cleanup"
|
|
|
|
|
|
# -------------------------------------------------------------------------
|
|
# Hint content
|
|
# -------------------------------------------------------------------------
|
|
|
|
def busy_input_hint_gateway(mode: str) -> str:
|
|
"""Hint shown the first time a user messages while the agent is busy.
|
|
|
|
``mode`` is the effective busy_input_mode that was just applied, so the
|
|
message matches reality ("I just interrupted…" vs "I just queued…").
|
|
"""
|
|
if mode == "queue":
|
|
return (
|
|
"💡 First-time tip — I queued your message instead of interrupting. "
|
|
"Send `/busy interrupt` to make new messages stop the current task "
|
|
"immediately, or `/busy status` to check. This notice won't appear again."
|
|
)
|
|
if mode == "steer":
|
|
return (
|
|
"💡 First-time tip — I steered your message into the current run; "
|
|
"it will arrive after the next tool call instead of interrupting. "
|
|
"Send `/busy interrupt` or `/busy queue` to change this, or "
|
|
"`/busy status` to check. This notice won't appear again."
|
|
)
|
|
return (
|
|
"💡 First-time tip — I just interrupted my current task to answer you. "
|
|
"Send `/busy queue` to queue follow-ups for after the current task instead, "
|
|
"`/busy steer` to inject them mid-run without interrupting, or "
|
|
"`/busy status` to check. This notice won't appear again."
|
|
)
|
|
|
|
|
|
def busy_input_hint_cli(mode: str) -> str:
|
|
"""CLI version of the busy-input hint (plain text, no markdown)."""
|
|
if mode == "queue":
|
|
return (
|
|
"(tip) Your message was queued for the next turn. "
|
|
"Use /busy interrupt to make Enter stop the current run instead, "
|
|
"or /busy steer to inject mid-run. This tip only shows once."
|
|
)
|
|
if mode == "steer":
|
|
return (
|
|
"(tip) Your message was steered into the current run; it arrives "
|
|
"after the next tool call. Use /busy interrupt or /busy queue to "
|
|
"change this. This tip only shows once."
|
|
)
|
|
return (
|
|
"(tip) Your message interrupted the current run. "
|
|
"Use /busy queue to queue messages for the next turn instead, "
|
|
"or /busy steer to inject mid-run. This tip only shows once."
|
|
)
|
|
|
|
|
|
def tool_progress_hint_gateway() -> str:
|
|
return (
|
|
"💡 First-time tip — that tool took a while and I'm streaming every step. "
|
|
"If the progress messages feel noisy, send `/verbose` to cycle modes "
|
|
"(all → new → off). This notice won't appear again."
|
|
)
|
|
|
|
|
|
def tool_progress_hint_cli() -> str:
|
|
return (
|
|
"(tip) That tool ran for a while. Use /verbose to cycle tool-progress "
|
|
"display modes (all -> new -> off -> verbose). This tip only shows once."
|
|
)
|
|
|
|
|
|
def openclaw_residue_hint_cli() -> str:
|
|
"""Banner shown the first time Hermes starts and finds ``~/.openclaw/``.
|
|
|
|
OpenClaw-era config, memory, and skill paths in ``~/.openclaw/`` will
|
|
otherwise attract the agent (memory entries like ``~/.openclaw/config.yaml``
|
|
get carried forward and the agent dutifully reads them). ``hermes claw
|
|
cleanup`` renames the directory so the agent stops finding it.
|
|
"""
|
|
return (
|
|
"Heads up — an OpenClaw workspace was detected at ~/.openclaw/.\n"
|
|
"After migrating, the agent can still get confused and read that "
|
|
"directory's config/memory instead of Hermes's.\n"
|
|
"Run `hermes claw cleanup` to archive it (rename → .openclaw.pre-migration). "
|
|
"This tip only shows once; rerun it any time with `hermes claw cleanup`."
|
|
)
|
|
|
|
|
|
def detect_openclaw_residue(home: Optional[Path] = None) -> bool:
|
|
"""Return True if an OpenClaw workspace directory is present in ``$HOME``.
|
|
|
|
Pure filesystem check — no side effects. ``home`` override exists for tests.
|
|
"""
|
|
base = home or Path.home()
|
|
try:
|
|
return (base / ".openclaw").is_dir()
|
|
except OSError:
|
|
return False
|
|
|
|
|
|
# -------------------------------------------------------------------------
|
|
# State read / write
|
|
# -------------------------------------------------------------------------
|
|
|
|
def _get_seen_dict(config: Mapping[str, Any]) -> Mapping[str, Any]:
|
|
onboarding = config.get("onboarding") if isinstance(config, Mapping) else None
|
|
if not isinstance(onboarding, Mapping):
|
|
return {}
|
|
seen = onboarding.get("seen")
|
|
return seen if isinstance(seen, Mapping) else {}
|
|
|
|
|
|
def is_seen(config: Mapping[str, Any], flag: str) -> bool:
|
|
"""Return True if the user has already been shown this first-touch hint."""
|
|
return bool(_get_seen_dict(config).get(flag))
|
|
|
|
|
|
def mark_seen(config_path: Path, flag: str) -> bool:
|
|
"""Persist ``onboarding.seen.<flag> = True`` to ``config_path``.
|
|
|
|
Uses the atomic YAML writer so a concurrent process can't observe a
|
|
partially-written file. Returns True on success, False on any error
|
|
(including the config file being absent — onboarding is best-effort).
|
|
"""
|
|
try:
|
|
import yaml
|
|
from utils import atomic_yaml_write
|
|
except Exception as e: # pragma: no cover — dependency issue
|
|
logger.debug("onboarding: failed to import yaml/utils: %s", e)
|
|
return False
|
|
|
|
try:
|
|
cfg: dict = {}
|
|
if config_path.exists():
|
|
with open(config_path, encoding="utf-8") as f:
|
|
cfg = yaml.safe_load(f) or {}
|
|
if not isinstance(cfg.get("onboarding"), dict):
|
|
cfg["onboarding"] = {}
|
|
seen = cfg["onboarding"].get("seen")
|
|
if not isinstance(seen, dict):
|
|
seen = {}
|
|
cfg["onboarding"]["seen"] = seen
|
|
if seen.get(flag) is True:
|
|
return True # already marked — nothing to do
|
|
seen[flag] = True
|
|
atomic_yaml_write(config_path, cfg)
|
|
return True
|
|
except Exception as e:
|
|
logger.debug("onboarding: failed to mark flag %s: %s", flag, e)
|
|
return False
|
|
|
|
|
|
__all__ = [
|
|
"BUSY_INPUT_FLAG",
|
|
"TOOL_PROGRESS_FLAG",
|
|
"OPENCLAW_RESIDUE_FLAG",
|
|
"busy_input_hint_gateway",
|
|
"busy_input_hint_cli",
|
|
"tool_progress_hint_gateway",
|
|
"tool_progress_hint_cli",
|
|
"openclaw_residue_hint_cli",
|
|
"detect_openclaw_residue",
|
|
"is_seen",
|
|
"mark_seen",
|
|
]
|