common/hermes
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: treat inline-shell timeout guard as timeout

Browse Source
This commit is contained in:
burjorjee
2026-05-18 19:35:58 -07:00
committed by Teknium
parent 4e9df52d60
commit 52b049b560
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
agent/skill_preprocessing.py
View File

@@ -79,6 +79,14 @@ def run_inline_shell(command: str, cwd: Path | None, timeout: int) -> str:
return f"[inline-shell timeout after {timeout}s: {command}]" return f"[inline-shell timeout after {timeout}s: {command}]"
except FileNotFoundError: except FileNotFoundError:
return "[inline-shell error: bash not found]" return "[inline-shell error: bash not found]"
except RuntimeError as exc:
# tests/conftest.py installs a live-system guard that blocks real
# os.kill on out-of-tree PIDs. subprocess.run(timeout=...) may trip
# that guard while trying to clean up the timed-out shell; treat that
# as the same timeout outcome instead of surfacing the guard error.
if "live-system guard: blocked os.kill" in str(exc):
return f"[inline-shell timeout after {timeout}s: {command}]"
return f"[inline-shell error: {exc}]"
except Exception as exc: except Exception as exc:
return f"[inline-shell error: {exc}]" return f"[inline-shell error: {exc}]"