mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-03 09:17:09 +08:00
fix: address PR review — alias expansion + L3 budget enforcement
- Add `shopt -s expand_aliases` to snapshot so aliases captured by `alias -p` actually work under `bash -c` (review comment #2) - Pass threshold=0 in enforce_turn_budget() so L3 can force-persist results below the 50K default when aggregate budget is exceeded (review comment #3) - Add regression test: 6x42K results (each under 50K) exceeding 200K budget are now correctly persisted
This commit is contained in:
@@ -19,6 +19,11 @@ logger = logging.getLogger(__name__)
|
||||
# process can extract the remote shell's cwd without a separate round-trip.
|
||||
_CWD_MARKER = "__HERMES_CWD__"
|
||||
|
||||
# Min seconds between file-sync checks in _before_execute hooks.
|
||||
# Remote backends (SSH, Modal, Daytona) skip re-walking the skills
|
||||
# directory and re-statting credential files within this window.
|
||||
_SYNC_INTERVAL_SECONDS: float = 5.0
|
||||
|
||||
|
||||
def get_sandbox_dir() -> Path:
|
||||
"""Return the host-side root for all sandbox storage (Docker workspaces,
|
||||
@@ -65,24 +70,23 @@ class _ThreadedProcessHandle:
|
||||
self.stdin = None
|
||||
|
||||
def _run():
|
||||
# Open the write end exactly once to avoid double-close races.
|
||||
writer = os.fdopen(self._write_fd, "w")
|
||||
try:
|
||||
output, exit_code = exec_fn()
|
||||
writer = os.fdopen(self._write_fd, "w")
|
||||
writer.write(output)
|
||||
writer.close()
|
||||
self._returncode = exit_code
|
||||
except Exception as e:
|
||||
try:
|
||||
writer = os.fdopen(self._write_fd, "w")
|
||||
writer.write(str(e))
|
||||
writer.close()
|
||||
except Exception:
|
||||
try:
|
||||
os.close(self._write_fd)
|
||||
except Exception:
|
||||
pass
|
||||
pass
|
||||
self._returncode = 1
|
||||
finally:
|
||||
try:
|
||||
writer.close()
|
||||
except Exception:
|
||||
pass
|
||||
self._done.set()
|
||||
|
||||
self._thread = threading.Thread(target=_run, daemon=True)
|
||||
@@ -192,6 +196,7 @@ class BaseEnvironment(ABC):
|
||||
f"if type declare >/dev/null 2>&1; then "
|
||||
f"declare -f >> {self._snapshot_path} 2>/dev/null; fi\n"
|
||||
f"alias -p >> {self._snapshot_path} 2>/dev/null || true\n"
|
||||
f"echo 'shopt -s expand_aliases' >> {self._snapshot_path}\n"
|
||||
f"echo 'set +e' >> {self._snapshot_path}\n"
|
||||
f"echo 'set +u' >> {self._snapshot_path}\n"
|
||||
f"printf '{_CWD_MARKER}%s{_CWD_MARKER}' \"$(pwd -P)\"\n"
|
||||
|
||||
@@ -28,7 +28,6 @@ logger = logging.getLogger(__name__)
|
||||
DEFAULT_MAX_RESULT_SIZE_CHARS: int = 50_000
|
||||
MAX_TURN_BUDGET_CHARS: int = 200_000
|
||||
PREVIEW_SIZE_CHARS: int = 2000
|
||||
PREVIEW_SIZE_BYTES = PREVIEW_SIZE_CHARS # deprecated alias
|
||||
PERSISTED_OUTPUT_TAG = "<persisted-output>"
|
||||
PERSISTED_OUTPUT_CLOSING_TAG = "</persisted-output>"
|
||||
|
||||
@@ -179,7 +178,8 @@ def enforce_turn_budget(
|
||||
content = msg["content"]
|
||||
tool_use_id = msg.get("tool_call_id", f"budget_{idx}")
|
||||
|
||||
result = persist_large_result(content, tool_use_id, storage_dir)
|
||||
result = persist_large_result(content, tool_use_id, storage_dir,
|
||||
threshold=0)
|
||||
if result:
|
||||
replacement = build_persisted_output_message(result)
|
||||
total_size -= size
|
||||
|
||||
Reference in New Issue
Block a user