fix(sync): CI fallout from the 301-commit merge (2 cross-feature gaps)

1. conversation_loop.py non-retryable fail-fast (#366) returned
   str(api_error) — a 403 Cloudflare body is ~60 KB of raw HTML that
   leaked into result['error'] and got delivered to chat. Our fail-fast
   path predates upstream's 'summarize non-retryable error' fix; return
   the already-computed _nr_summary instead (matches the other
   non-retryable paths). Fixes test_nonretryable_error_html_summary.

2. test_setup_blank_slate expected the upstream baseline tool set; our
   fork's repo_map (#320) lives in the file toolset so blank-slate
   includes it. Added repo_map to the expected set with a note.

Author: Lexus2016

agent/conversation_loop.py

@@ -3133,7 +3133,12 @@ def _perform_api_call(next_api_kwargs):
                         "api_calls": api_call_count,
                         "completed": False,
                         "failed": True,
-                        "error": str(api_error),
+                        # Use the summarized error, not str(api_error): a 403
+                        # Cloudflare challenge body is ~60 KB of raw HTML and
+                        # must not leak into result['error'] (it gets delivered
+                        # to chat). Matches the other non-retryable paths.
+                        # See test_nonretryable_error_html_summary.
+                        "error": _nr_summary,
                         "failure_reason": classified.reason.value,
                     }
 

tests/hermes_cli/test_setup_blank_slate.py

@@ -56,8 +56,11 @@ def test_tool_schema_builder_yields_only_file_and_terminal_tools(self):
         names = sorted(
             {(d.get("function") or {}).get("name") or d.get("name") for d in defs}
         )
-        assert names == ["patch", "process", "read_file", "search_files",
-                         "terminal", "write_file"]
+        # repo_map is an evolution-fork addition (#320) that lives in the file
+        # toolset, so blank-slate (file + terminal) includes it. Upstream's
+        # baseline lacks it — keep it in this expected set on the fork.
+        assert names == ["patch", "process", "read_file", "repo_map",
+                         "search_files", "terminal", "write_file"]
 
 
 class TestBlankSlateMinimizeConfig: