fix: use blocking exit code for frozen agents
This commit is contained in:
1 parent
fd725976f3
commit
f10e86dcec
2 files changed
+114
-3
No files matched your search
@@ -297,7 +297,7 @@ def generate_guard_script(agent_name: str, agent_id: str) -> str:
|
|||||||
1. Reads agent config from ~/.elydora/{agent_id}/config.json
|
1. Reads agent config from ~/.elydora/{agent_id}/config.json
|
||||||
2. Checks cached status from ~/.elydora/{agent_id}/status-cache.json (60s TTL)
|
2. Checks cached status from ~/.elydora/{agent_id}/status-cache.json (60s TTL)
|
||||||
3. If cache is stale, fetches agent status from GET {base_url}/v1/agents/{agent_id}
|
3. If cache is stale, fetches agent status from GET {base_url}/v1/agents/{agent_id}
|
||||||
4. If status is "frozen", writes error to stderr and exits with code 1 (blocks tool)
|
4. If status is "frozen", writes error to stderr and exits with blocking code 2
|
||||||
5. Fail-open: if API unreachable or config missing, exits 0 (allow)
|
5. Fail-open: if API unreachable or config missing, exits 0 (allow)
|
||||||
6. Uses only stdlib — no external deps
|
6. Uses only stdlib — no external deps
|
||||||
"""
|
"""
|
||||||
@@ -343,7 +343,7 @@ def main():
|
|||||||
sys.stderr.write(
|
sys.stderr.write(
|
||||||
'Agent "' + AGENT_NAME + '" is frozen by Elydora. Tool execution blocked.\\n'
|
'Agent "' + AGENT_NAME + '" is frozen by Elydora. Tool execution blocked.\\n'
|
||||||
)
|
)
|
||||||
sys.exit(1)
|
sys.exit(2)
|
||||||
return # Cache is fresh — use cached result
|
return # Cache is fresh — use cached result
|
||||||
except Exception:
|
except Exception:
|
||||||
pass # No cache or invalid — need to check API
|
pass # No cache or invalid — need to check API
|
||||||
@@ -381,7 +381,7 @@ def main():
|
|||||||
sys.stderr.write(
|
sys.stderr.write(
|
||||||
'Agent "' + AGENT_NAME + '" is frozen by Elydora. Tool execution blocked.\\n'
|
'Agent "' + AGENT_NAME + '" is frozen by Elydora. Tool execution blocked.\\n'
|
||||||
)
|
)
|
||||||
sys.exit(1)
|
sys.exit(2)
|
||||||
except SystemExit:
|
except SystemExit:
|
||||||
raise # Re-raise sys.exit
|
raise # Re-raise sys.exit
|
||||||
except Exception:
|
except Exception:
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||||
|
from pathlib import Path
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
|
from elydora.plugins.hook_template import generate_guard_script
|
||||||
|
|
||||||
|
|
||||||
|
AGENT_ID = "agent 1"
|
||||||
|
|
||||||
|
|
||||||
|
class StatusHandler(BaseHTTPRequestHandler):
|
||||||
|
status = "active"
|
||||||
|
request_path = ""
|
||||||
|
|
||||||
|
def do_GET(self) -> None:
|
||||||
|
type(self).request_path = self.path
|
||||||
|
body = json.dumps({"agent": {"status": type(self).status}}).encode()
|
||||||
|
self.send_response(200)
|
||||||
|
self.send_header("Content-Type", "application/json")
|
||||||
|
self.send_header("Content-Length", str(len(body)))
|
||||||
|
self.end_headers()
|
||||||
|
self.wfile.write(body)
|
||||||
|
|
||||||
|
def log_message(self, _format: str, *_args: object) -> None:
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def create_guard(tmp_path: Path, status: str) -> tuple[Path, ThreadingHTTPServer]:
|
||||||
|
StatusHandler.status = status
|
||||||
|
StatusHandler.request_path = ""
|
||||||
|
server = ThreadingHTTPServer(("127.0.0.1", 0), StatusHandler)
|
||||||
|
Thread(target=server.serve_forever, daemon=True).start()
|
||||||
|
|
||||||
|
agent_dir = tmp_path / ".elydora" / AGENT_ID
|
||||||
|
agent_dir.mkdir(parents=True)
|
||||||
|
config = {
|
||||||
|
"agent_id": AGENT_ID,
|
||||||
|
"base_url": f"http://127.0.0.1:{server.server_port}",
|
||||||
|
}
|
||||||
|
(agent_dir / "config.json").write_text(json.dumps(config), encoding="utf-8")
|
||||||
|
|
||||||
|
script_path = tmp_path / "guard.py"
|
||||||
|
script_path.write_text(
|
||||||
|
generate_guard_script("claudecode", AGENT_ID),
|
||||||
|
encoding="utf-8",
|
||||||
|
)
|
||||||
|
return script_path, server
|
||||||
|
|
||||||
|
|
||||||
|
def run_guard(script_path: Path, home_dir: Path) -> subprocess.CompletedProcess[str]:
|
||||||
|
env = {
|
||||||
|
**os.environ,
|
||||||
|
"HOME": str(home_dir),
|
||||||
|
"USERPROFILE": str(home_dir),
|
||||||
|
}
|
||||||
|
return subprocess.run(
|
||||||
|
[sys.executable, str(script_path)],
|
||||||
|
capture_output=True,
|
||||||
|
check=False,
|
||||||
|
env=env,
|
||||||
|
input="",
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_remote_frozen_status_blocks_tool_execution(tmp_path: Path) -> None:
|
||||||
|
script_path, server = create_guard(tmp_path, "frozen")
|
||||||
|
try:
|
||||||
|
result = run_guard(script_path, tmp_path)
|
||||||
|
finally:
|
||||||
|
server.shutdown()
|
||||||
|
server.server_close()
|
||||||
|
|
||||||
|
assert result.returncode == 2
|
||||||
|
assert "Tool execution blocked" in result.stderr
|
||||||
|
assert StatusHandler.request_path == "/v1/agents/agent%201"
|
||||||
|
|
||||||
|
|
||||||
|
def test_active_status_allows_tool_execution(tmp_path: Path) -> None:
|
||||||
|
script_path, server = create_guard(tmp_path, "active")
|
||||||
|
try:
|
||||||
|
result = run_guard(script_path, tmp_path)
|
||||||
|
finally:
|
||||||
|
server.shutdown()
|
||||||
|
server.server_close()
|
||||||
|
|
||||||
|
assert result.returncode == 0
|
||||||
|
assert result.stderr == ""
|
||||||
|
|
||||||
|
|
||||||
|
def test_cached_frozen_status_uses_blocking_exit_code(tmp_path: Path) -> None:
|
||||||
|
script_path, server = create_guard(tmp_path, "active")
|
||||||
|
cache_path = tmp_path / ".elydora" / AGENT_ID / "status-cache.json"
|
||||||
|
cache_path.write_text(
|
||||||
|
json.dumps({"status": "frozen", "cached_at": 4_102_444_800}),
|
||||||
|
encoding="utf-8",
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
result = run_guard(script_path, tmp_path)
|
||||||
|
finally:
|
||||||
|
server.shutdown()
|
||||||
|
server.server_close()
|
||||||
|
|
||||||
|
assert result.returncode == 2
|
||||||
|
assert "Tool execution blocked" in result.stderr
|
||||||
Reference in new issue
Block a user