The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(sessions): export's refusals and failures exit non-zero too
John Paul Soliva204ccada740b
diff --git a/hermes_cli/sessions_cmd.py b/hermes_cli/sessions_cmd.pyindex 81ef40d88a3..fff477b5af8 100644--- a/hermes_cli/sessions_cmd.py+++ b/hermes_cli/sessions_cmd.py@@ -350,7 +350,7 @@ def _cmd_export(db, args):filters = build_prune_filters(args)except ValueError as e:print(f"Error: {e}")- return+ return 1# A backup includes protected rows; prune's keep rules must not omit them.filters["archived"] = Nonefilters["include_pinned"] = True@@ -388,7 +388,8 @@ def _cmd_export(db, args):return Falsedef _collect_sessions():- """--session-id / filters / bare export -> redacted session dicts, or None after printing an error."""+ """--session-id / filters / bare export -> redacted session dicts, None after a dry-run preview,+ or an exit code after printing an error."""def _one(session_id):return _redact(db.export_session(session_id, **projection))if args.session_id:@@ -397,8 +398,7 @@ def _cmd_export(db, args):return Nonedata = _one(resolved) if resolved else Noneif not data:- _not_found(args.session_id)- return None+ return _not_found(args.session_id)return [data]if filters:candidates = db.list_prune_candidates(**filters)@@ -408,7 +408,8 @@ def _cmd_export(db, args):return Nonereturn [s for s in (_one(row["id"]) for row in candidates) if s]if args.dry_run:- return print("--dry-run requires at least one filter.")+ print("--dry-run requires at least one filter.")+ return 1if _too_large():return Nonereturn [_redact(s) for s in db.export_all(source=None, **projection)]@@ -457,8 +458,10 @@ def _export_flat(kind, args, collect):unusable, message, render = _FLAT_EXPORTERS[kind]if unusable(args):print(message)- return+ return 1sessions = collect()+ if isinstance(sessions, int):+ return sessionsif sessions is not None:from hermes_cli.session_export import default_save_filenamename = (default_save_filename(sessions[0].get("id", ""), args.format) if len(sessions) == 1@@ -476,13 +479,13 @@ def _export_trace(db, args, filters):session_id = rows[0].get("id") if rows else Noneif not session_id:print("No session found to export. Pass --session-id.")- return+ return 1from agent.trace_upload import TraceRedactionError, build_trace_jsonl, upload_session_traceredact_trace = not getattr(args, "no_redact", False)if getattr(args, "upload", False):if not session_id:print("--upload exports one session: pass --session-id (or drop filters to use the most recent).")- return+ return 1resolved = db.resolve_session_id(session_id)db.close()print(upload_session_trace(resolved, cwd="", redact=redact_trace, private=not getattr(args, "public", False)))@@ -506,7 +509,7 @@ def _export_trace(db, args, filters):jsonl = _render_trace(ids[0])if not jsonl:print(f"No transcript to export for session '{ids[0]}'.")- return+ return 1args.output = _output_file_in_dir(args.output, f"{ids[0]}.trace.jsonl")_write_output(args.output, jsonl, f"Exported 1 session trace to {args.output}")else:@@ -521,6 +524,7 @@ def _export_trace(db, args, filters):print(f"Exported {exported} session trace(s) to {out_dir}")except TraceRedactionError:print("Redaction failed; refusing to export unredacted trace content.")+ return 1def _export_markdown(db, args, filters, redact):@@ -528,7 +532,7 @@ def _export_markdown(db, args, filters, redact):from hermes_cli.session_export_md import append_manifest_entry, write_session_markdownif args.output == "-":print("Markdown/QMD export writes files; stdout (-) is only supported with --format jsonl.")- return+ return 1output_dir = _export_dir(args.output)def _export_one(session_id: str, *, include_lineage: bool = False):@@ -548,17 +552,17 @@ def _export_markdown(db, args, filters, redact):return data, path, snapshotsif args.delete_after_verified and not args.yes:print("--delete-after-verified requires --yes.")- return+ return 1if args.delete_after_verified and not args.session_id:print("--delete-after-verified is only supported with --session-id.")- return+ return 1lineage_is_logical = getattr(args, "lineage", "single") == "logical"if args.session_id:return _export_markdown_single(db, args, _export_one, output_dir, lineage_is_logical)if not filters:print("Refusing bulk export without a filter. Pass --session-id or ""at least one filter (e.g. --older-than 90, --source telegram).")- return+ return 1candidates = db.list_prune_candidates(**filters)if args.dry_run:return _print_dry_run_preview(candidates, filters)@@ -589,10 +593,10 @@ def _export_markdown_single(db, args, export_one, output_dir, lineage_is_logical)except FileExistsError as e:print(f"Export already exists: {e}. Pass --force to overwrite.")- return+ return 1if not data or not exported_path:print(f"Session '{target_id}' disappeared during export; nothing was deleted.")- return+ return 1exported_items.append((data, exported_path, snapshots))message_count = sum(len(data.get("messages") or []) for data, _path, _ in exported_items)n = len(exported_items)@@ -607,7 +611,7 @@ def _export_markdown_single(db, args, export_one, output_dir, lineage_is_logicalok, reason = verify_export_file(exported_path, data)if not ok:print(f"Export verification failed; not deleting session '{data.get('id')}': {reason}")- return+ return 1expected_messages.update(snapshots)try:if not db.delete_session(@@ -616,10 +620,10 @@ def _export_markdown_single(db, args, export_one, output_dir, lineage_is_logical):print(f"Exported, but session '{resolved_session_id}' was not deleted because its history or delegate set ""changed after export.")- return+ return 1except SessionActiveWriteGuardError as exc:print(f"Exported, but not deleted: {exc}")- return+ return 1delegates = len(delete_target_ids) - 1delegate_suffix = f" and {delegates} delegate session{'' if delegates == 1 else 's'}" if delegates else ""print(f"Deleted exported session '{resolved_session_id}'{delegate_suffix}.")diff --git a/tests/hermes_cli/test_sessions_failure_exit_codes.py b/tests/hermes_cli/test_sessions_failure_exit_codes.pyindex a68523ec477..36ef188f33d 100644--- a/tests/hermes_cli/test_sessions_failure_exit_codes.py+++ b/tests/hermes_cli/test_sessions_failure_exit_codes.py@@ -35,11 +35,14 @@ def test_sessions_repair_that_fails_exits_nonzero(monkeypatch, capsys):(["archive"], ["archive", "--source", "cli", "--yes"]),(["prune", "--never-active", "--older-than", "not-a-duration"],["prune", "--never-active", "--older-than", "2d", "--yes"]),+ (["export", "exports", "--format", "md"], ["export", "exports", "--format", "md", "--older-than", "90"]),+ (["export", "out.jsonl", "--session-id", "no-such-session"], ["export", "out.jsonl"]),])-def test_refused_bulk_action_exits_nonzero_where_the_valid_form_exits_zero(monkeypatch, refused, accepted):+def test_refused_bulk_action_exits_nonzero_where_the_valid_form_exits_zero(monkeypatch, tmp_path, refused, accepted):from hermes_state import SessionDBSessionDB().close()+ monkeypatch.chdir(tmp_path)assert _run_cli(monkeypatch, accepted) == 0assert _run_cli(monkeypatch, refused) != 0