mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-16 19:36:54 +00:00
# Conflicts: # apps/desktop/e2e/archived-hidden-session-recoverable.spec.ts # apps/desktop/e2e/bot-chat-message-agent-friendly-name.spec.ts # apps/desktop/e2e/bot-mailbox-unreadable-ticket.spec.ts # apps/desktop/e2e/bot-mode-roster-localized.spec.ts # apps/desktop/e2e/bot-mode-row-click-mirrors-registry.spec.ts # apps/desktop/e2e/bot-mode-tab-shows-bot-name.spec.ts # apps/desktop/e2e/bot-roster-group-row-organisation.spec.ts # apps/desktop/e2e/bot-roster-ignores-infra-dirs.spec.ts # apps/desktop/e2e/bot-roster-timestamp-meta.spec.ts # apps/desktop/e2e/bot-roster-user-sections.spec.ts # apps/desktop/e2e/bot-routines-pane-narrow.spec.ts # apps/desktop/e2e/bot-row-open-recent-session.spec.ts # apps/desktop/e2e/bot-tile-ignores-ambient-composer-model.spec.ts # apps/desktop/e2e/group-composer-auto-grow.spec.ts # apps/desktop/e2e/group-create-gate-remote-roster.spec.ts # apps/desktop/e2e/group-prompt-renamed-primary-handle.spec.ts # apps/desktop/e2e/hosted-room-backend-continuity.spec.ts # apps/desktop/e2e/hosted-room-legacy-store-migration.spec.ts # apps/desktop/e2e/settings-scope-chips-bot-title.spec.ts # apps/desktop/e2e/worktree-branch-status.spec.ts # apps/desktop/electron/backend-probes.test.ts # apps/desktop/electron/connection-apply.test.ts # apps/desktop/electron/desktop-electron-pin.test.ts # apps/desktop/electron/desktop-uninstall.test.ts # apps/desktop/electron/gateway-file-download-transport.test.ts # apps/desktop/electron/gateway-stop-before-update.test.ts # apps/desktop/electron/github-api-auth.test.ts # apps/desktop/electron/registry-primary-profile-scope.test.ts # apps/desktop/electron/update-api-check.test.ts # apps/desktop/electron/update-handoff-marker.test.ts # apps/desktop/electron/venv-blocker-scan.test.ts # apps/desktop/scripts/after-extract.test.mjs # apps/desktop/scripts/local-pack-publish.test.mjs # apps/desktop/scripts/tasks-scroll.test.mjs # apps/desktop/src/app/settings/model-settings.test.tsx # apps/desktop/src/app/updates-overlay.blockers.test.tsx # apps/desktop/src/components/desktop-install-overlay.test.tsx # apps/desktop/src/lib/update-copy.test.ts # scripts/ci/check_os_marker_fakes.py # tests-js/desktop-mac-usage-descriptions.test.ts # tests-js/node-engine-alignment.test.ts # tests/agent/lsp/test_install_and_lint_fixes.py # tests/agent/test_command_token_source.py # tests/agent/test_compression_boundary_hook.py # tests/agent/test_create_openai_client_ssl_verify.py # tests/agent/test_custom_provider_ca_probes.py # tests/agent/test_endpoint_blackhole.py # tests/agent/test_estimator_parity.py # tests/agent/test_in_place_compaction.py # tests/agent/test_moa_loop_mode.py # tests/agent/test_model_metadata.py # tests/agent/test_skill_session_platform_gate.py # tests/agent/test_skill_utils.py # tests/agent/test_ssl_ca_guard.py # tests/computer_use/test_doctor.py # tests/cron/test_codex_execution_paths.py # tests/cron/test_cron_bot_chat_delivery.py # tests/cron/test_cron_script.py # tests/cron/test_media_delivery_parity.py # tests/cron/test_misfire_catchup.py # tests/cron/test_parallel_pool.py # tests/cron/test_recurring_eagain_redispatch.py # tests/gateway/test_choice_picker.py # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_dingtalk.py # tests/gateway/test_feishu.py # tests/gateway/test_feishu_onboard.py # tests/gateway/test_gateway_shutdown.py # tests/gateway/test_matrix.py # tests/gateway/test_model_command_custom_providers.py # tests/gateway/test_reasoning_command.py # tests/gateway/test_runtime_footer.py # tests/gateway/test_session.py # tests/gateway/test_session_hygiene.py # tests/gateway/test_status.py # tests/gateway/test_teams.py # tests/gateway/test_turn_lease.py # tests/gateway/test_whatsapp_connect.py # tests/hermes_cli/test_approvals_command.py # tests/hermes_cli/test_auth_store_lock_concurrent.py # tests/hermes_cli/test_backup.py # tests/hermes_cli/test_banner_git_state.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_compat_manifest_targets.py # tests/hermes_cli/test_computer_use_cli.py # tests/hermes_cli/test_cpr_local_leak.py # tests/hermes_cli/test_dashboard_auth_gate.py # tests/hermes_cli/test_dashboard_procs_kill_grace.py # tests/hermes_cli/test_desktop_lifecycle_windows_live.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_command_install.py # tests/hermes_cli/test_fleet_config_migration_windows_live.py # tests/hermes_cli/test_gateway.py # tests/hermes_cli/test_gateway_platform_gating.py # tests/hermes_cli/test_gateway_restart_loop.py # tests/hermes_cli/test_gateway_task_probe.py # tests/hermes_cli/test_gateway_wsl.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_install_cua_driver.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_command_exports.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_linux_desktop_entry.py # tests/hermes_cli/test_local_runtime.py # tests/hermes_cli/test_local_runtime_updates.py # tests/hermes_cli/test_managed_uv.py # tests/hermes_cli/test_mcp_reload_confirm_gate.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_npm_engine.py # tests/hermes_cli/test_personality_none.py # tests/hermes_cli/test_pet_toggle.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_plugin_event_bus.py # tests/hermes_cli/test_plugin_manifest_v2.py # tests/hermes_cli/test_plugin_packs.py # tests/hermes_cli/test_plugins_cmd.py # tests/hermes_cli/test_plugins_cmd_enable_disable_nested.py # tests/hermes_cli/test_process_identity.py # tests/hermes_cli/test_profiles.py # tests/hermes_cli/test_profiles_sidebar_cache.py # tests/hermes_cli/test_pty_bridge.py # tests/hermes_cli/test_resolve_turn_limit.py # tests/hermes_cli/test_serve_runtime_inventory.py # tests/hermes_cli/test_session_vacuum_config.py # tests/hermes_cli/test_set_config_value.py # tests/hermes_cli/test_signal_handler_kanban_worker.py # tests/hermes_cli/test_slash_confirm_windows.py # tests/hermes_cli/test_stale_pid_guard.py # tests/hermes_cli/test_startup_fast_guards.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_telegram_managed_bot.py # tests/hermes_cli/test_tools_config.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_autostash.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_fetch_failure_classifier.py # tests/hermes_cli/test_update_fleet_probe_resume_token.py # tests/hermes_cli/test_update_handoff_backend_reap.py # tests/hermes_cli/test_update_handoff_desktop_rebuild.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_host_obligation.py # tests/hermes_cli/test_update_import_guard.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_update_inventory.py # tests/hermes_cli/test_update_launchd_unloaded_gateway.py # tests/hermes_cli/test_update_missing_configured_deps.py # tests/hermes_cli/test_update_modified_notice.py # tests/hermes_cli/test_update_multiplex_migration_hook.py # tests/hermes_cli/test_update_no_gateway_restart.py # tests/hermes_cli/test_update_orphan_backend_reap.py # tests/hermes_cli/test_update_parked_branch_guard.py # tests/hermes_cli/test_update_post_pull_syntax_guard.py # tests/hermes_cli/test_update_receipt.py # tests/hermes_cli/test_update_self_lock.py # tests/hermes_cli/test_update_shim_fail_closed.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_update_sqlite_remediation.py # tests/hermes_cli/test_update_stale_dashboard.py # tests/hermes_cli/test_update_stale_virtualenv.py # tests/hermes_cli/test_update_venv_health.py # tests/hermes_cli/test_update_venv_ownership_preflight.py # tests/hermes_cli/test_update_wedged_gateway.py # tests/hermes_cli/test_update_yes_flag.py # tests/hermes_cli/test_update_zip_two_phase.py # tests/hermes_cli/test_urllib_security.py # tests/hermes_cli/test_ux_messages_auth_config.py # tests/hermes_cli/test_ux_messages_startup.py # tests/hermes_cli/test_venv_holder_classifier.py # tests/hermes_cli/test_verify_console_scripts.py # tests/hermes_cli/test_verify_core_dependencies.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_server_console_ws.py # tests/hermes_cli/test_web_server_ws_ping.py # tests/hermes_cli/test_web_ui_build.py # tests/hermes_state/test_fts_rebuild_admission.py # tests/hermes_state/test_hermes_state.py # tests/plugins/memory/test_memory_lazy_install.py # tests/plugins/test_google_meet_plugin.py # tests/plugins/test_langfuse_plugin.py # tests/plugins/test_security_guidance_plugin.py # tests/plugins/test_transform_llm_output_hook.py # tests/scripts/desktop_update/test_desktop_update_windows_gateway_flag.py # tests/scripts/desktop_update/test_desktop_update_windows_python_handoff.py # tests/scripts/desktop_update/test_desktop_update_windows_timestamp.py # tests/scripts/install/test_install_clone_throttle_fallback.py # tests/scripts/install/test_install_lockfile_churn.py # tests/scripts/install/test_install_no_initial_commit.py # tests/scripts/install/test_install_sh_browser_install.py # tests/scripts/install/test_install_sh_node_prerelease.py # tests/scripts/install/test_install_sh_symlink_stomp.py # tests/scripts/install/test_install_sh_uv_lock_config.py # tests/scripts/install/test_install_unmerged_index.py # tests/scripts/test_contributor_map.py # tests/scripts/test_run_tests_parallel.py # tests/skills/test_competitor_news_monitor_skill.py # tests/skills/test_document_to_action_items_skill.py # tests/skills/test_google_workspace_setup.py # tests/skills/test_google_workspace_setup_deps.py # tests/skills/test_grounded_citations_skill.py # tests/skills/test_ip_as_logo_skill.py # tests/skills/test_live_dashboard_skill.py # tests/skills/test_mcp_oauth_remote_gateway_skill.py # tests/skills/test_office_document_skills.py # tests/skills/test_openclaw_migration.py # tests/skills/test_product_price_monitor_skill.py # tests/skills/test_scrollcraft_skill.py # tests/skills/test_setup_wizard_generator_skill.py # tests/skills/test_weekly_review_planning_skill.py # tests/test_engines_satisfiable.py # tests/test_fast_safe_load.py # tests/test_hermes_bootstrap.py # tests/test_hermes_constants.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/test_model_tools_async_bridge.py # tests/test_packaging_build_guard.py # tests/test_packaging_metadata.py # tests/test_yaml_indent_consistency.py # tests/tools/test_approval_timeout_overflow.py # tests/tools/test_base_environment.py # tests/tools/test_bot_mode_dm.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_hardening.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_use_cli.py # tests/tools/test_clipboard.py # tests/tools/test_code_execution.py # tests/tools/test_code_execution_modes.py # tests/tools/test_code_execution_windows_env.py # tests/tools/test_computer_use.py # tests/tools/test_delegate_liveness_timeout.py # tests/tools/test_execute_code_approval_cluster.py # tests/tools/test_execution_flag_detection.py # tests/tools/test_fal_common.py # tests/tools/test_file_operations.py # tests/tools/test_file_tools.py # tests/tools/test_file_tools_cwd_resolution.py # tests/tools/test_file_tools_live.py # tests/tools/test_lazy_deps.py # tests/tools/test_lazy_deps_durable_target.py # tests/tools/test_lazy_deps_managed.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_local_tempdir.py # tests/tools/test_macos_protected_search.py # tests/tools/test_mcp_npx_cached_bin.py # tests/tools/test_oneshot_completion_linger.py # tests/tools/test_process_registry.py # tests/tools/test_read_file_schema_gating.py # tests/tools/test_skill_improvements.py # tests/tools/test_skills_sync.py # tests/tools/test_termux_api_detection.py # tests/tools/test_tirith_security.py # tests/tools/test_transcription_tools.py # tests/tools/test_tts_streaming.py # tests/tools/test_wake_word.py # tests/tui_gateway/test_compute_host_borrowed_lease.py # tests/tui_gateway/test_compute_host_turn_protocol.py # tests/tui_gateway/test_isolated_orphan_activity.py # tests/tui_gateway/test_protocol.py # tests/tui_gateway/test_slash_worker_profile_home.py # tests/tui_gateway/test_subprocess_encoding.py # tests/tui_gateway/test_tui_gateway_server.py # ui-tui/src/__tests__/terminalParity.test.ts # ui-tui/src/__tests__/termuxComposerLayout.test.ts # ui-tui/src/__tests__/textInputFastEcho.test.ts
235 lines
8.5 KiB
Python
235 lines
8.5 KiB
Python
"""#99692 — the streamed auxiliary summary must not outlive its compression host.
|
|
|
|
Background
|
|
----------
|
|
``run_compress_context_with_progress_timeout`` arms a wall-clock deadline on the
|
|
``CompressionCommitFence`` (``set_total_ceiling_seconds``), whose docstring calls
|
|
it "the wall-clock deadline **shared by the host and worker**". Only the host
|
|
ever read it.
|
|
|
|
``8207862212`` (fix(compression): stop timeout paths from blocking retries)
|
|
closed the first half: a cancelled fence now releases the compression OWNER,
|
|
which frees the pool slot and the session lease. It left the second half open
|
|
by design — its own comment says the isolated provider daemon runs on "until
|
|
the auxiliary stream's longer absolute ceiling expires".
|
|
|
|
That ceiling is ``_aux_stream_total_ceiling`` = ``max(600, 4 * aux_timeout)``:
|
|
>= the default host ceiling (600s) for every configured timeout, and it starts
|
|
counting later (after pool admission, serialization, prompt build and TTFT).
|
|
So the daemon holding the socket is *always* still streaming when its host gives
|
|
up — 2400s with the reporter's ``auxiliary.compression.timeout: 600`` — billing
|
|
every token of a summary the fence is already guaranteed to refuse, and stacking
|
|
one fresh orphan per turn because the session never shrank.
|
|
|
|
These tests pin the missing half of that shared deadline: the stream consumer
|
|
must stop at the host's deadline, including on the isolated provider daemon
|
|
that ``_run_protected_sync_provider_call`` spawns.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import threading
|
|
import time
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
from agent import auxiliary_client as aux
|
|
from agent.conversation_compression import (
|
|
CompressionCommitFence,
|
|
)
|
|
|
|
|
|
def _chunk(text: str) -> SimpleNamespace:
|
|
return SimpleNamespace(
|
|
id="resp-1",
|
|
model="test-model",
|
|
usage=None,
|
|
choices=[
|
|
SimpleNamespace(
|
|
index=0,
|
|
finish_reason=None,
|
|
delta=SimpleNamespace(content=text, tool_calls=None),
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
class _Stream:
|
|
"""Chunk iterator that records how far the consumer drained it."""
|
|
|
|
def __init__(self, count: int = 50) -> None:
|
|
self._count = count
|
|
self.yielded = 0
|
|
self.closed = False
|
|
|
|
def __iter__(self):
|
|
for _ in range(self._count):
|
|
self.yielded += 1
|
|
yield _chunk("x")
|
|
|
|
def close(self) -> None:
|
|
self.closed = True
|
|
|
|
|
|
class _AsyncStream(_Stream):
|
|
async def __aiter__(self): # pragma: no cover - exercised via asyncio.run
|
|
for _ in range(self._count):
|
|
self.yielded += 1
|
|
yield _chunk("x")
|
|
|
|
|
|
# ── The structural gap the bug lives in ──────────────────────────────────
|
|
|
|
|
|
|
|
|
|
# ── The fence must publish the deadline it already owns ──────────────────
|
|
|
|
|
|
def test_commit_fence_publishes_its_shared_deadline(monkeypatch):
|
|
now = [10.0]
|
|
monkeypatch.setattr("agent.conversation_compression.time.monotonic", lambda: now[0])
|
|
fence = CompressionCommitFence()
|
|
assert fence.deadline_monotonic is None
|
|
|
|
fence.set_total_ceiling_seconds(600.0)
|
|
published = fence.deadline_monotonic
|
|
assert published is not None
|
|
assert 590.0 < published - time.monotonic() <= 600.0
|
|
assert not fence.deadline_exceeded
|
|
|
|
fence.set_total_ceiling_seconds(0.001)
|
|
now[0] += 1.0
|
|
assert fence.deadline_exceeded
|
|
assert fence.deadline_monotonic <= time.monotonic()
|
|
|
|
|
|
# ── The stream consumer must honour it ───────────────────────────────────
|
|
|
|
|
|
def test_streamed_summary_stops_at_an_elapsed_host_deadline():
|
|
"""A host that already gave up must not leave the worker streaming on."""
|
|
stream = _Stream(count=50)
|
|
with aux.aux_stream_deadline(time.monotonic() - 1.0):
|
|
with pytest.raises(TimeoutError) as excinfo:
|
|
aux._aggregate_chat_stream(stream, model="m", total_ceiling=2400.0)
|
|
|
|
# "timed out" keeps _is_timeout_error classification identical to a
|
|
# request timeout, so the existing recovery chains are unchanged.
|
|
assert "timed out" in str(excinfo.value)
|
|
# Stopped on the first frame instead of draining the whole stream, and the
|
|
# HTTP response was closed rather than left dangling.
|
|
assert stream.yielded == 1
|
|
assert stream.closed is True
|
|
|
|
|
|
def test_streamed_summary_runs_to_completion_under_a_live_host_deadline():
|
|
stream = _Stream(count=5)
|
|
with aux.aux_stream_deadline(time.monotonic() + 600.0):
|
|
response = aux._aggregate_chat_stream(
|
|
stream, model="m", total_ceiling=2400.0
|
|
)
|
|
assert response.choices[0].message.content == "xxxxx"
|
|
assert stream.yielded == 5
|
|
|
|
|
|
def test_no_host_deadline_keeps_the_historical_ceiling_behaviour():
|
|
"""Every non-compression aux caller must be byte-for-byte unchanged."""
|
|
stream = _Stream(count=5)
|
|
response = aux._aggregate_chat_stream(stream, model="m", total_ceiling=2400.0)
|
|
assert response.choices[0].message.content == "xxxxx"
|
|
assert stream.yielded == 5
|
|
|
|
# An installed-then-exited scope must not leak into the next call.
|
|
with aux.aux_stream_deadline(time.monotonic() - 1.0):
|
|
pass
|
|
stream2 = _Stream(count=3)
|
|
assert (
|
|
aux._aggregate_chat_stream(
|
|
stream2, model="m", total_ceiling=2400.0
|
|
).choices[0].message.content
|
|
== "xxx"
|
|
)
|
|
|
|
|
|
def test_none_deadline_is_a_no_op_passthrough():
|
|
"""Callers wire the scope unconditionally; a fenceless call must not break."""
|
|
stream = _Stream(count=3)
|
|
with aux.aux_stream_deadline(None):
|
|
response = aux._aggregate_chat_stream(
|
|
stream, model="m", total_ceiling=2400.0
|
|
)
|
|
assert response.choices[0].message.content == "xxx"
|
|
|
|
|
|
def test_nested_none_inherits_rather_than_escaping_the_host_deadline():
|
|
"""A fenceless aux call nested inside a fenced one stays bounded.
|
|
|
|
``None`` means "I have no deadline of my own", not "clear the one in
|
|
force" — mirroring ``_aux_thread_local_hook``'s passthrough contract. If it
|
|
cleared, any nested auxiliary call made during compression would escape the
|
|
host ceiling that the whole attempt is supposed to live inside.
|
|
"""
|
|
outer = time.monotonic() - 1.0
|
|
stream = _Stream(count=50)
|
|
with aux.aux_stream_deadline(outer):
|
|
with aux.aux_stream_deadline(None):
|
|
assert aux._current_aux_stream_deadline() == outer
|
|
with pytest.raises(TimeoutError):
|
|
aux._aggregate_chat_stream(stream, model="m", total_ceiling=2400.0)
|
|
assert stream.yielded == 1
|
|
|
|
|
|
def test_deadline_scope_restores_the_previous_value():
|
|
outer = time.monotonic() + 900.0
|
|
with aux.aux_stream_deadline(outer):
|
|
assert aux._current_aux_stream_deadline() == outer
|
|
with aux.aux_stream_deadline(time.monotonic() + 10.0):
|
|
assert aux._current_aux_stream_deadline() != outer
|
|
assert aux._current_aux_stream_deadline() == outer
|
|
assert aux._current_aux_stream_deadline() is None
|
|
|
|
|
|
def test_async_stream_mirror_honours_the_host_deadline():
|
|
"""The async consumer must not drift from the sync one."""
|
|
stream = _AsyncStream(count=50)
|
|
|
|
async def _run():
|
|
with aux.aux_stream_deadline(time.monotonic() - 1.0):
|
|
return await aux._aggregate_chat_stream_async(
|
|
stream, model="m", total_ceiling=2400.0
|
|
)
|
|
|
|
with pytest.raises(TimeoutError):
|
|
asyncio.run(_run())
|
|
assert stream.yielded == 1
|
|
|
|
|
|
# ── The isolated provider daemon must inherit it ─────────────────────────
|
|
|
|
|
|
def test_protected_provider_daemon_inherits_the_host_deadline():
|
|
"""``_run_protected_sync_provider_call`` runs the stream on ANOTHER thread.
|
|
|
|
Thread-locals do not cross that boundary, so without explicit propagation
|
|
the fix would be inert on exactly the path large-session compression takes
|
|
(protected + hard-cancel source installed).
|
|
"""
|
|
seen: dict[str, object] = {}
|
|
|
|
def _callback(_kwargs):
|
|
seen["deadline"] = aux._current_aux_stream_deadline()
|
|
seen["thread"] = threading.current_thread().name
|
|
return "ok"
|
|
|
|
deadline = time.monotonic() + 42.0
|
|
cancel_event = threading.Event()
|
|
with aux.aux_progress_hook(lambda: None), aux.aux_interrupt_protection(
|
|
cancel_event=cancel_event
|
|
), aux.aux_stream_deadline(deadline):
|
|
assert aux._run_protected_sync_provider_call(_callback, {}) == "ok"
|
|
|
|
assert seen["thread"] != threading.current_thread().name
|
|
assert seen["deadline"] == deadline
|