diff --git a/hermes_cli/web_server.py b/hermes_cli/web_server.py index a6bb5ba1a..ddaed53d3 100644 --- a/hermes_cli/web_server.py +++ b/hermes_cli/web_server.py @@ -11915,8 +11915,9 @@ def _new_dashboard_backup_path() -> Path: async def run_backup(body: BackupRequest): args = ["backup"] archive: Optional[Path] = None - if body.output: - args.append(body.output.strip()) + output = (body.output or "").strip() + if output: + args.extend(["-o", output]) else: archive = _new_dashboard_backup_path() try: @@ -11926,7 +11927,7 @@ async def run_backup(body: BackupRequest): status_code=500, detail=f"Could not create backup directory: {exc}", ) - args.append(str(archive)) + args.extend(["-o", str(archive)]) try: proc = _spawn_hermes_action(args, "backup") except Exception as exc: diff --git a/tests/hermes_cli/test_dashboard_admin_endpoints.py b/tests/hermes_cli/test_dashboard_admin_endpoints.py index ee93c0c49..14744a217 100644 --- a/tests/hermes_cli/test_dashboard_admin_endpoints.py +++ b/tests/hermes_cli/test_dashboard_admin_endpoints.py @@ -338,6 +338,60 @@ class TestOpsEndpoints: def _setup(self, _isolate_hermes_home): self.client, _ = _client() + def test_backup_output_uses_output_flag(self, monkeypatch): + import hermes_cli.web_server as ws + + captured = {} + + class FakeProc: + pid = 12345 + + def fake_spawn_action(subcommand, name): + captured["subcommand"] = subcommand + captured["name"] = name + return FakeProc() + + monkeypatch.setattr(ws, "_spawn_hermes_action", fake_spawn_action) + + r = self.client.post( + "/api/ops/backup", + json={"output": " /tmp/hermes-test.zip "}, + ) + + assert r.status_code == 200 + assert captured == { + "subcommand": ["backup", "-o", "/tmp/hermes-test.zip"], + "name": "backup", + } + + def test_backup_blank_output_uses_default_archive(self, monkeypatch): + from pathlib import Path + + import hermes_cli.web_server as ws + from hermes_cli.config import get_hermes_home + + captured = {} + + class FakeProc: + pid = 12345 + + def fake_spawn_action(subcommand, name): + captured["subcommand"] = subcommand + captured["name"] = name + return FakeProc() + + monkeypatch.setattr(ws, "_spawn_hermes_action", fake_spawn_action) + + r = self.client.post("/api/ops/backup", json={"output": " "}) + + assert r.status_code == 200 + archive = Path(r.json()["archive"]) + assert captured == { + "subcommand": ["backup", "-o", str(archive)], + "name": "backup", + } + assert archive.parent == get_hermes_home() / "backups" + def test_hooks_list_reads_config(self): from hermes_cli.config import load_config, save_config diff --git a/tests/hermes_cli/test_web_server.py b/tests/hermes_cli/test_web_server.py index fc42fcc28..17e6d2054 100644 --- a/tests/hermes_cli/test_web_server.py +++ b/tests/hermes_cli/test_web_server.py @@ -2385,7 +2385,7 @@ class TestWebServerEndpoints: assert data["name"] == "backup" assert captured["name"] == "backup" - assert captured["args"] == ["backup", str(archive)] + assert captured["args"] == ["backup", "-o", str(archive)] assert archive.parent == get_hermes_home() / "backups" assert archive.name.startswith("hermes-backup-") assert archive.suffix == ".zip" @@ -2412,7 +2412,7 @@ class TestWebServerEndpoints: archive = Path(resp.json()["archive"]) assert archive.parent == hosted_home / "backups" - assert captured["args"] == ["backup", str(archive)] + assert captured["args"] == ["backup", "-o", str(archive)] assert archive.parent.is_dir() def test_ops_backup_download_streams_dashboard_backup(self, tmp_path):