mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-16 19:36:54 +00:00
Path.glob raises NotImplementedError for a non-relative pattern, which a string `workspaces` (iterated char by char, so "/") or an absolute entry produces. The (OSError, ValueError, TypeError) catch missed it, so the error escaped to the caller's suppress(Exception) and no lock was reverted at all -- back to autostash every run. Non-list values are now ignored and each pattern is tried on its own so a bad one just owns nothing. install.sh: read the workspace globs with `while read` instead of an unquoted $(...) so they are never pathname-expanded against the caller's CWD before `case` sees the pattern.
66 lines
2.6 KiB
Python
66 lines
2.6 KiB
Python
"""`hermes update` lockfile-churn cleanup must respect npm workspace ownership (#112378).
|
|
|
|
The single root ``package-lock.json`` spans every workspace declared in the root ``package.json``
|
|
``workspaces`` globs, so a dirty workspace manifest (``apps/desktop/package.json``) protects it;
|
|
a dirty manifest outside the workspace graph does not.
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
import subprocess
|
|
|
|
from hermes_cli.update_cmd_git import _discard_lockfile_churn
|
|
|
|
_GIT_ENV = {
|
|
**os.environ,
|
|
"GIT_AUTHOR_NAME": "t", "GIT_AUTHOR_EMAIL": "[email protected]",
|
|
"GIT_COMMITTER_NAME": "t", "GIT_COMMITTER_EMAIL": "[email protected]",
|
|
}
|
|
|
|
|
|
def _git(repo, *args):
|
|
return subprocess.run(["git", *args], cwd=repo, text=True, capture_output=True, check=True, env=_GIT_ENV).stdout
|
|
|
|
|
|
def _repo(tmp_path):
|
|
_git(tmp_path, "init", "-q")
|
|
(tmp_path / "package.json").write_text(json.dumps({"workspaces": ["apps/*", "ui-tui"]}), encoding="utf-8")
|
|
(tmp_path / "package-lock.json").write_text("lock v1\n", encoding="utf-8")
|
|
for rel in ("apps/desktop", "ui-tui", "vendor/foo"):
|
|
(tmp_path / rel).mkdir(parents=True)
|
|
(tmp_path / rel / "package.json").write_text("{}\n", encoding="utf-8")
|
|
_git(tmp_path, "add", ".")
|
|
_git(tmp_path, "commit", "-qm", "initial")
|
|
return tmp_path
|
|
|
|
|
|
def _still_dirty_after_cleanup(repo, *dirty):
|
|
for rel in dirty:
|
|
(repo / rel).write_text("dirty\n", encoding="utf-8")
|
|
_discard_lockfile_churn(["git"], repo)
|
|
return set(_git(repo, "diff", "--name-only").splitlines())
|
|
|
|
|
|
def test_dirty_workspace_manifest_preserves_root_lock(tmp_path):
|
|
repo = _repo(tmp_path)
|
|
assert _still_dirty_after_cleanup(repo, "apps/desktop/package.json", "package-lock.json") == {
|
|
"apps/desktop/package.json", "package-lock.json",
|
|
}
|
|
|
|
|
|
def test_manifest_outside_workspace_graph_does_not_protect_root_lock(tmp_path):
|
|
repo = _repo(tmp_path)
|
|
assert _still_dirty_after_cleanup(repo, "vendor/foo/package.json", "package-lock.json") == {
|
|
"vendor/foo/package.json",
|
|
}
|
|
|
|
|
|
def test_unsupported_workspaces_glob_still_discards_root_lock_churn(tmp_path):
|
|
"""A string ``workspaces`` (iterated char by char, '/' is a non-relative glob) must not abort
|
|
the cleanup: the churned root lock is still reverted, the bad entry just owns nothing."""
|
|
repo = _repo(tmp_path)
|
|
(repo / "package.json").write_text(json.dumps({"workspaces": "apps/*"}), encoding="utf-8")
|
|
_git(repo, "commit", "-qam", "string workspaces")
|
|
assert _still_dirty_after_cleanup(repo, "vendor/foo/package.json", "package-lock.json") == {
|
|
"vendor/foo/package.json",
|
|
}
|