ouyangbo/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 9 Packages Projects Releases Wiki Activity

fix(skills): literal HOME replacement; ~/$VAR still expands the variable

Browse Source 
`re.sub` with the home path as a template string parsed backslashes as
escapes (re.error dropped the whole injected config block); use a callable.
The early `~/…` return also skipped `expandvars`, leaving `~/$LEAF` half
resolved. Prefix-substitute and fall through to normal expansion instead.
This commit is contained in:
teknium1
2026-09-12 08:09:23 -07:00
committed by Teknium
parent 86211492d1
commit 66dbb656be
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/skill_utils.py
+5 -5
View File
@@ -715,11 +715,11 @@ def _expand_skill_config_path(value: str) -> str:
"""
subprocess_home = get_subprocess_home()
if subprocess_home:
if value == "~":
return subprocess_home
if value.startswith(("~/", "~\\")):
return os.path.join(subprocess_home, value[2:])
value = _HOME_VAR_RE.sub(subprocess_home, value)
if value == "~" or value.startswith(("~/", "~\\")):
value = subprocess_home + value[1:]
# Callable replacement: a literal template would parse backslashes in the home path
# as regex escapes.
value = _HOME_VAR_RE.sub(lambda _m: subprocess_home, value)
return os.path.expanduser(os.path.expandvars(value))
tests/agent/test_skill_utils.py
+5 -1
View File
@@ -152,7 +152,8 @@ def test_skill_config_home_vars_use_subprocess_home(tmp_path, monkeypatch):
control process HOME; other variables keep normal expansion (#12260)."""
from agent import skill_utils
hermes_home = tmp_path / "data"
# A backslash in the home path must not be read as a regex-replacement escape.
hermes_home = tmp_path / "da\\ta"
subprocess_home = hermes_home / "home"
subprocess_home.mkdir(parents=True)
(hermes_home / "config.yaml").write_text("", encoding="utf-8")
@@ -160,6 +161,7 @@ def test_skill_config_home_vars_use_subprocess_home(tmp_path, monkeypatch):
monkeypatch.setenv("HOME", str(hermes_home))
monkeypatch.setenv("TERMINAL_HOME_MODE", "profile")
monkeypatch.setenv("PROJECT_ROOT", "/proj")
monkeypatch.setenv("LEAF", "leaf")
getattr(skill_utils, "_raw_config_cache_clear", lambda: None)()
resolved = resolve_skill_config_values([
@@ -167,12 +169,14 @@ def test_skill_config_home_vars_use_subprocess_home(tmp_path, monkeypatch):
{"key": "wiki.braced_home", "default": "${HOME}/notes"},
{"key": "wiki.tilde", "default": "~/scratch"},
{"key": "wiki.other_var", "default": "${PROJECT_ROOT}/cache"},
{"key": "wiki.tilde_var", "default": "~/$LEAF"},
])
assert resolved["wiki.home_var"] == str(subprocess_home / "wiki")
assert resolved["wiki.braced_home"] == str(subprocess_home / "notes")
assert resolved["wiki.tilde"] == str(subprocess_home / "scratch")
assert resolved["wiki.other_var"] == "/proj/cache"
assert resolved["wiki.tilde_var"] == str(subprocess_home / "leaf")
def test_iter_skill_index_files_prunes_skill_support_dirs(tmp_path):