Match Hermes flag probe at a boundary, cover the mise path
Review follow-up on the readiness probe. The two greps were fixed-string substring matches, so a future release listing only --tui-theme or --query-log while dropping the bare --tui/--query omarchy-agent passes would read as ready -- the same false verdict inverted. Anchor both to a flag boundary. Add a regression case pinning that a substring-only help is rejected, and one exercising --check through a mise-installed hermes in both capability directions: the desktop and foreign cases only covered their own wrappers, and the mise path is what a machine without the app runs. Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2 files changed
+59
-2
No files matched your search
@@ -92,12 +92,17 @@ hermes_runs() {
|
|||||||
# session and --tui to keep it interactive -- rather than a flag that merely
|
# session and --tui to keep it interactive -- rather than a flag that merely
|
||||||
# shipped alongside them: the previous marker, --oneshot, was dropped in Hermes
|
# shipped alongside them: the previous marker, --oneshot, was dropped in Hermes
|
||||||
# v0.20 and left working installs stranded as "not ready".
|
# v0.20 and left working installs stranded as "not ready".
|
||||||
|
#
|
||||||
|
# Matched at a flag boundary, not as a substring: a bare grep for --tui also
|
||||||
|
# accepts a release that lists only --tui-theme while having dropped --tui
|
||||||
|
# itself, which would call an install ready that omarchy-agent cannot drive --
|
||||||
|
# the same false verdict this check exists to prevent, merely inverted.
|
||||||
hermes_prompt_ready() {
|
hermes_prompt_ready() {
|
||||||
local help
|
local help
|
||||||
hermes_runs &&
|
hermes_runs &&
|
||||||
help=$(timeout 15 "$HOME/.local/bin/hermes" chat --help 2>/dev/null) &&
|
help=$(timeout 15 "$HOME/.local/bin/hermes" chat --help 2>/dev/null) &&
|
||||||
grep -qF -- '--tui' <<<"$help" &&
|
grep -qE -- '--tui([^[:alnum:]-]|$)' <<<"$help" &&
|
||||||
grep -qF -- '--query' <<<"$help"
|
grep -qE -- '--query([^[:alnum:]-]|$)' <<<"$help"
|
||||||
}
|
}
|
||||||
|
|
||||||
# --owns answers whether the wrapper on PATH is the one this command wrote, so
|
# --owns answers whether the wrapper on PATH is the one this command wrote, so
|
||||||
|
|||||||
@@ -23,6 +23,11 @@ cat >"$mock_bin/omarchy-cmd-missing" <<'SH'
|
|||||||
SH
|
SH
|
||||||
|
|
||||||
# `mise where` must fail so the installer sees no Hermes behind the stub.
|
# `mise where` must fail so the installer sees no Hermes behind the stub.
|
||||||
|
#
|
||||||
|
# With OMARCHY_TEST_MISE_X_HERMES=1, `mise x -- hermes ...` emulates the Hermes
|
||||||
|
# the Omarchy stub runs, so the readiness probe can be exercised through a
|
||||||
|
# mise-installed hermes and not only the foreign and desktop wrappers. Off by
|
||||||
|
# default, so `mise x` stays silent for every test that does not opt in.
|
||||||
cat >"$mock_bin/mise" <<'SH'
|
cat >"$mock_bin/mise" <<'SH'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
printf '%s\0' "$@" >>"$OMARCHY_TEST_MISE_LOG"
|
printf '%s\0' "$@" >>"$OMARCHY_TEST_MISE_LOG"
|
||||||
@@ -30,6 +35,18 @@ if [[ $1 == "where" && ${OMARCHY_TEST_MISE_WHERE_OK:-0} == 1 ]]; then
|
|||||||
printf '%s\n' "$OMARCHY_TEST_MISE_ROOT"
|
printf '%s\n' "$OMARCHY_TEST_MISE_ROOT"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
if [[ $1 == "x" && ${OMARCHY_TEST_MISE_X_HERMES:-0} == 1 ]]; then
|
||||||
|
# Args are `x <tool> -- hermes <hermes-args...>`; skip to what follows hermes.
|
||||||
|
shift
|
||||||
|
while (( $# )) && [[ $1 != "--" ]]; do shift; done
|
||||||
|
shift 2
|
||||||
|
if [[ ${1:-} == "chat" && ${2:-} == "--help" ]]; then
|
||||||
|
[[ ${OMARCHY_TEST_HERMES_CAPABLE:-1} == 1 ]] && echo "[-q QUERY, --query QUERY] [--tui]"
|
||||||
|
else
|
||||||
|
echo "hermes-agent 0.0.0-test"
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
[[ $1 != "where" ]]
|
[[ $1 != "where" ]]
|
||||||
SH
|
SH
|
||||||
|
|
||||||
@@ -237,6 +254,26 @@ tr '\0' '\n' <"$mise_log" | grep -q '^rm$' || fail "an older owned Hermes enviro
|
|||||||
tr '\0' '\n' <"$mise_log" | grep -q '^uninstall$' || fail "an older owned Hermes environment is uninstalled"
|
tr '\0' '\n' <"$mise_log" | grep -q '^uninstall$' || fail "an older owned Hermes environment is uninstalled"
|
||||||
pass "reinstalling replaces an older owned Hermes environment"
|
pass "reinstalling replaces an older owned Hermes environment"
|
||||||
|
|
||||||
|
# The mise-installed path is what a machine without the desktop app runs, and
|
||||||
|
# --check gates the default agent there too. The stub is present and its mise
|
||||||
|
# environment resolves, so readiness turns on the hermes mise runs -- exercised
|
||||||
|
# here in both directions, since the desktop and foreign cases cover only their
|
||||||
|
# own wrappers.
|
||||||
|
run_mise_check() {
|
||||||
|
OMARCHY_TEST_DESKTOP_INSTALLED=0 \
|
||||||
|
OMARCHY_TEST_MISE_WHERE_OK=1 \
|
||||||
|
OMARCHY_TEST_MISE_ROOT="$test_tmp/mise" \
|
||||||
|
OMARCHY_TEST_MISE_LOG="$mise_log" \
|
||||||
|
OMARCHY_TEST_MISE_X_HERMES=1 \
|
||||||
|
OMARCHY_TEST_HERMES_CAPABLE="$1" \
|
||||||
|
HOME="$test_home" \
|
||||||
|
PATH="$mock_bin:$PATH" \
|
||||||
|
bash "$ROOT/bin/omarchy-install-hermes-cli" --check >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
run_mise_check 1 || fail "--check accepts a mise-installed hermes that runs the seeded session"
|
||||||
|
run_mise_check 0 && fail "--check rejects a mise-installed hermes without the flags omarchy-agent passes"
|
||||||
|
pass "--check follows the mise-installed hermes it would actually run"
|
||||||
|
|
||||||
rm -f "$test_home/.local/bin/hermes"
|
rm -f "$test_home/.local/bin/hermes"
|
||||||
: >"$mise_log"
|
: >"$mise_log"
|
||||||
OMARCHY_TEST_MISE_WHERE_OK=1 run_installer 0 &&
|
OMARCHY_TEST_MISE_WHERE_OK=1 run_installer 0 &&
|
||||||
@@ -410,3 +447,18 @@ SH
|
|||||||
chmod +x "$ready_home/.hermes/hermes-agent/venv/bin/hermes"
|
chmod +x "$ready_home/.hermes/hermes-agent/venv/bin/hermes"
|
||||||
run_ready_check && fail "--check accepts a release without the flags omarchy-agent passes"
|
run_ready_check && fail "--check accepts a release without the flags omarchy-agent passes"
|
||||||
pass "a release listing only --oneshot is not prompt-ready"
|
pass "a release listing only --oneshot is not prompt-ready"
|
||||||
|
|
||||||
|
# A release that lists --tui-theme and --query-log but has dropped the bare
|
||||||
|
# --tui/--query omarchy-agent passes must not read as ready on the substring
|
||||||
|
# alone. The probe matches at a flag boundary for exactly this case.
|
||||||
|
cat >"$ready_home/.hermes/hermes-agent/venv/bin/hermes" <<'SH'
|
||||||
|
#!/bin/bash
|
||||||
|
if [[ ${1:-} == "chat" && ${2:-} == "--help" ]]; then
|
||||||
|
echo "[--tui-theme THEME] [--query-log FILE]"
|
||||||
|
else
|
||||||
|
echo "hermes-agent 0.0.0-test"
|
||||||
|
fi
|
||||||
|
SH
|
||||||
|
chmod +x "$ready_home/.hermes/hermes-agent/venv/bin/hermes"
|
||||||
|
run_ready_check && fail "--check accepts a release whose flags only contain --tui/--query as a substring"
|
||||||
|
pass "a flag that merely contains --tui or --query is not prompt-ready"
|
||||||
Reference in new issue
Block a user