# 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
528 lines
20 KiB
Python
528 lines
20 KiB
Python
"""Tests for busy-session acknowledgment when user sends messages during active agent runs.
|
|
|
|
Verifies that users get an immediate status response instead of total silence
|
|
when the agent is working on a task. See PR fix for the @Lonely__MH report.
|
|
"""
|
|
import time
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Minimal stubs so we can import gateway code without heavy deps
|
|
# ---------------------------------------------------------------------------
|
|
import sys, types
|
|
|
|
_tg = types.ModuleType("telegram")
|
|
_tg.constants = types.ModuleType("telegram.constants")
|
|
_ct = MagicMock()
|
|
_ct.SUPERGROUP = "supergroup"
|
|
_ct.GROUP = "group"
|
|
_ct.PRIVATE = "private"
|
|
_tg.constants.ChatType = _ct
|
|
sys.modules.setdefault("telegram", _tg)
|
|
sys.modules.setdefault("telegram.constants", _tg.constants)
|
|
sys.modules.setdefault("telegram.ext", types.ModuleType("telegram.ext"))
|
|
|
|
from gateway.platforms.base import (
|
|
Platform,
|
|
SessionSource,
|
|
build_session_key,
|
|
)
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _make_event(text="hello", chat_id="123", platform_val="telegram"):
|
|
"""Build a minimal MessageEvent."""
|
|
source = SessionSource(
|
|
platform=MagicMock(value=platform_val),
|
|
chat_id=chat_id,
|
|
chat_type="private",
|
|
user_id="user1",
|
|
)
|
|
evt = MessageEvent(
|
|
text=text,
|
|
message_type=MessageType.TEXT,
|
|
source=source,
|
|
message_id="msg1",
|
|
)
|
|
return evt
|
|
|
|
|
|
def _make_runner():
|
|
"""Build a minimal GatewayRunner-like object for testing."""
|
|
from gateway.run import GatewayRunner, _AGENT_PENDING_SENTINEL
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._running_agents = {}
|
|
runner._running_agents_ts = {}
|
|
runner._pending_messages = {}
|
|
runner._busy_ack_ts = {}
|
|
runner._draining = False
|
|
runner._busy_text_mode = "interrupt"
|
|
runner.adapters = {}
|
|
runner.config = MagicMock()
|
|
runner.config.group_sessions_per_user = True
|
|
runner.config.thread_sessions_per_user = False
|
|
runner.session_store = None
|
|
runner.hooks = MagicMock()
|
|
runner.hooks.emit = AsyncMock()
|
|
runner.pairing_store = MagicMock()
|
|
runner.pairing_store.is_approved.return_value = True
|
|
runner._is_user_authorized = lambda _source: True
|
|
return runner, _AGENT_PENDING_SENTINEL
|
|
|
|
|
|
def _make_adapter(platform_val="telegram"):
|
|
"""Build a minimal adapter mock."""
|
|
adapter = MagicMock()
|
|
adapter._pending_messages = {}
|
|
adapter._send_with_retry = AsyncMock()
|
|
adapter.config = MagicMock()
|
|
adapter.config.extra = {}
|
|
adapter.platform = MagicMock(value=platform_val)
|
|
adapter._text_debounce = {}
|
|
adapter._busy_text_debounce_seconds = 0.6
|
|
return adapter
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestBusySessionAck:
|
|
"""User sends a message while agent is running — should get acknowledgment."""
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_telegram_grace_followups_respect_queue_fifo(self, monkeypatch):
|
|
"""Rapid Telegram text follow-ups in queue mode must not merge."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
monkeypatch.setenv("HERMES_TELEGRAM_FOLLOWUP_GRACE_SECONDS", "3.0")
|
|
|
|
runner, _sentinel = _make_runner()
|
|
runner._busy_input_mode = "queue"
|
|
runner._queued_events = {}
|
|
adapter = _make_adapter()
|
|
|
|
source = SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
chat_id="123",
|
|
chat_type="dm",
|
|
user_id="user1",
|
|
)
|
|
sk = build_session_key(source)
|
|
runner.adapters[source.platform] = adapter
|
|
|
|
agent = MagicMock()
|
|
agent.get_activity_summary.return_value = {
|
|
"seconds_since_activity": 0.0,
|
|
}
|
|
runner._running_agents[sk] = agent
|
|
runner._running_agents_ts[sk] = time.time()
|
|
|
|
events = [
|
|
MessageEvent(
|
|
text=text,
|
|
message_type=MessageType.TEXT,
|
|
source=source,
|
|
message_id=f"m-{idx}",
|
|
)
|
|
for idx, text in enumerate(("first", "second", "third"), start=1)
|
|
]
|
|
|
|
for event in events:
|
|
result = await GatewayRunner._handle_message(runner, event)
|
|
assert result is None
|
|
|
|
assert adapter._pending_messages[sk].text == "first"
|
|
assert [event.text for event in runner._queued_events[sk]] == [
|
|
"second",
|
|
"third",
|
|
]
|
|
agent.interrupt.assert_not_called()
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_sends_ack_when_agent_running(self):
|
|
"""First message during busy session should get a status ack."""
|
|
runner, sentinel = _make_runner()
|
|
runner._busy_input_mode = "interrupt"
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="Are you working?")
|
|
sk = build_session_key(event.source)
|
|
|
|
# Simulate running agent
|
|
agent = MagicMock()
|
|
agent.get_activity_summary.return_value = {
|
|
"api_call_count": 21,
|
|
"max_iterations": 60,
|
|
"current_tool": "terminal",
|
|
"last_activity_ts": time.time(),
|
|
"last_activity_desc": "terminal",
|
|
"seconds_since_activity": 1.0,
|
|
}
|
|
runner._running_agents[sk] = agent
|
|
runner._running_agents_ts[sk] = time.time() - 600 # 10 min ago
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
result = await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
assert result is True # handled
|
|
# Verify ack was sent
|
|
adapter._send_with_retry.assert_called_once()
|
|
call_kwargs = adapter._send_with_retry.call_args
|
|
content = call_kwargs.kwargs.get("content") or call_kwargs[1].get("content", "")
|
|
if not content and call_kwargs.args:
|
|
# positional args
|
|
content = str(call_kwargs)
|
|
assert "Interrupting" in content or "respond" in content
|
|
assert "/stop" not in content # no need — we ARE interrupting
|
|
|
|
# Verify agent interrupt was called
|
|
agent.interrupt.assert_called_once_with("Are you working?")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_steer_mode_calls_agent_steer_no_interrupt_no_queue(self, monkeypatch):
|
|
"""busy_input_mode='steer' injects via agent.steer() and skips queueing."""
|
|
import gateway.run as _gr
|
|
|
|
monkeypatch.delenv("HERMES_GATEWAY_BUSY_STEER_ACK_ENABLED", raising=False)
|
|
monkeypatch.setattr(_gr, "_load_gateway_config", lambda: {})
|
|
runner, sentinel = _make_runner()
|
|
runner._busy_input_mode = "steer"
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="also check the tests")
|
|
sk = build_session_key(event.source)
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
agent = MagicMock()
|
|
agent.steer = MagicMock(return_value=True)
|
|
runner._running_agents[sk] = agent
|
|
|
|
with patch("gateway.platforms.base.merge_pending_message_event") as mock_merge:
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
# VERIFY: Agent was steered, NOT interrupted
|
|
agent.steer.assert_called_once()
|
|
injected = agent.steer.call_args.args[0]
|
|
assert injected.endswith("also check the tests")
|
|
assert '"chat_id": "123"' in injected
|
|
agent.interrupt.assert_not_called()
|
|
|
|
# VERIFY: No queueing — successful steer must NOT replay as next turn
|
|
mock_merge.assert_not_called()
|
|
|
|
# VERIFY: Ack mentions steer wording
|
|
adapter._send_with_retry.assert_called_once()
|
|
call_kwargs = adapter._send_with_retry.call_args
|
|
content = call_kwargs.kwargs.get("content") or call_kwargs[1].get("content", "")
|
|
assert "Steered" in content or "steer" in content.lower()
|
|
assert "Interrupting" not in content
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_steer_mode_transcribes_voice_before_injection(self, monkeypatch):
|
|
"""A busy voice follow-up is transcribed and steered, never queued."""
|
|
import gateway.run as _gr
|
|
|
|
monkeypatch.delenv("HERMES_GATEWAY_BUSY_STEER_ACK_ENABLED", raising=False)
|
|
monkeypatch.setattr(_gr, "_load_gateway_config", lambda: {})
|
|
runner, _sentinel = _make_runner()
|
|
runner._busy_input_mode = "steer"
|
|
runner._should_echo_stt_transcripts = MagicMock(return_value=False)
|
|
runner._enrich_message_with_transcription = AsyncMock(
|
|
return_value=('"yönü teknik mimariye çevir"', ["yönü teknik mimariye çevir"])
|
|
)
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="")
|
|
event.message_type = MessageType.VOICE
|
|
event.media_urls = ["/tmp/follow-up.ogg"]
|
|
event.media_types = ["audio/ogg"]
|
|
sk = build_session_key(event.source)
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
agent = MagicMock()
|
|
agent.steer = MagicMock(return_value=True)
|
|
runner._running_agents[sk] = agent
|
|
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
runner._enrich_message_with_transcription.assert_awaited_once_with(
|
|
"", ["/tmp/follow-up.ogg"]
|
|
)
|
|
agent.steer.assert_called_once()
|
|
injected = agent.steer.call_args.args[0]
|
|
assert injected.endswith('"yönü teknik mimariye çevir"')
|
|
assert '"chat_id": "123"' in injected
|
|
agent.interrupt.assert_not_called()
|
|
assert sk not in adapter._pending_messages
|
|
content = adapter._send_with_retry.call_args.kwargs["content"]
|
|
assert "Steered" in content
|
|
assert "Queued" not in content
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_steer_mode_falls_back_to_queue_when_agent_rejects(self):
|
|
"""If agent.steer() returns False, fall back to queue behavior."""
|
|
runner, sentinel = _make_runner()
|
|
runner._busy_input_mode = "steer"
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="empty or rejected")
|
|
sk = build_session_key(event.source)
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
agent = MagicMock()
|
|
agent.steer = MagicMock(return_value=False) # rejected
|
|
runner._running_agents[sk] = agent
|
|
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
agent.steer.assert_called_once()
|
|
agent.interrupt.assert_not_called()
|
|
# Fell back to queue semantics: event was stored for the next turn
|
|
# via the FIFO path (each follow-up its own turn — no newline-merge
|
|
# that would mash separate messages together, #43066).
|
|
assert adapter._pending_messages.get(sk) is event
|
|
|
|
# Ack uses queue-mode wording (not steer, not interrupt)
|
|
call_kwargs = adapter._send_with_retry.call_args
|
|
content = call_kwargs.kwargs.get("content") or call_kwargs[1].get("content", "")
|
|
assert "Queued for the next turn" in content
|
|
assert "Steered" not in content
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_steer_mode_falls_back_to_queue_when_agent_pending(self):
|
|
"""If agent is still starting (sentinel), steer mode falls back to queue."""
|
|
runner, sentinel = _make_runner()
|
|
runner._busy_input_mode = "steer"
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="arrived too early")
|
|
sk = build_session_key(event.source)
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
# Agent is still being set up — sentinel in place
|
|
runner._running_agents[sk] = sentinel
|
|
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
# Event was queued instead of steered (FIFO path, #43066)
|
|
assert adapter._pending_messages.get(sk) is event
|
|
|
|
call_kwargs = adapter._send_with_retry.call_args
|
|
content = call_kwargs.kwargs.get("content") or call_kwargs[1].get("content", "")
|
|
assert "Queued for the next turn" in content
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_interrupt_mode_text_followups_fifo_not_merged(self):
|
|
"""Two TEXT follow-ups during a busy turn (interrupt mode) must each
|
|
get their OWN next-turn slot via FIFO — NOT newline-merged into one
|
|
mashed-together turn (#43066 sub-bug 2). Before the fix the
|
|
interrupt/steer-fallback path called merge_pending_message_event
|
|
with merge_text=True, collapsing 'first' and 'second' into
|
|
'first\\nsecond' and destroying message boundaries."""
|
|
runner, _sentinel = _make_runner()
|
|
runner._busy_input_mode = "interrupt"
|
|
runner._queued_events = {}
|
|
adapter = _make_adapter()
|
|
|
|
# Both events must share the SAME platform object so they resolve to
|
|
# the same adapter (a fresh MagicMock per event would not).
|
|
shared_platform = Platform.TELEGRAM
|
|
|
|
def _evt(text):
|
|
src = SessionSource(
|
|
platform=shared_platform, chat_id="123",
|
|
chat_type="dm", user_id="user1",
|
|
)
|
|
return MessageEvent(text=text, message_type=MessageType.TEXT,
|
|
source=src, message_id=f"m-{text[:5]}")
|
|
|
|
first = _evt("first message")
|
|
second = _evt("second message")
|
|
sk = build_session_key(first.source)
|
|
runner.adapters[shared_platform] = adapter
|
|
|
|
agent = MagicMock()
|
|
agent._active_children = [] # real list → not demoted to queue
|
|
runner._running_agents[sk] = agent
|
|
|
|
await runner._handle_active_session_busy_message(first, sk)
|
|
runner._busy_ack_ts = {} # avoid the 30s ack-debounce early return
|
|
await runner._handle_active_session_busy_message(second, sk)
|
|
|
|
# First lands in the head slot; second goes to the FIFO overflow —
|
|
# they are NOT merged into a single pending event.
|
|
head = adapter._pending_messages.get(sk)
|
|
assert head is first
|
|
assert head.text == "first message" # not "first message\nsecond message"
|
|
overflow = runner._queued_events.get(sk, [])
|
|
assert [e.text for e in overflow] == ["second message"]
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_status_detail_omits_denominator_for_unbounded_max_iterations(
|
|
self, monkeypatch,
|
|
):
|
|
"""#102806: a top-level session's real max_iterations is sys.maxsize
|
|
(unlimited — see AIAgent's default). The busy-ack must not print that
|
|
literal sentinel as an iteration ceiling."""
|
|
import sys
|
|
|
|
import gateway.run as _gr
|
|
|
|
monkeypatch.setattr(
|
|
_gr,
|
|
"_load_gateway_config",
|
|
lambda: {"display": {"platforms": {"telegram": {"busy_ack_detail": True}}}},
|
|
)
|
|
runner, sentinel = _make_runner()
|
|
runner._busy_input_mode = "interrupt"
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="yo")
|
|
sk = build_session_key(event.source)
|
|
|
|
agent = MagicMock()
|
|
agent.get_activity_summary.return_value = {
|
|
"api_call_count": 3,
|
|
"max_iterations": sys.maxsize,
|
|
"current_tool": "terminal",
|
|
"last_activity_ts": time.time(),
|
|
"last_activity_desc": "terminal",
|
|
"seconds_since_activity": 0.5,
|
|
}
|
|
runner._running_agents[sk] = agent
|
|
runner._running_agents_ts[sk] = time.time() - 600
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
call_kwargs = adapter._send_with_retry.call_args
|
|
content = call_kwargs.kwargs.get("content", "")
|
|
assert content
|
|
assert str(sys.maxsize) not in content
|
|
|
|
|
|
class TestBusySessionOnboardingHint:
|
|
"""First-touch hint appended to the busy-ack the first time it fires."""
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_first_busy_ack_appends_interrupt_hint(self, tmp_path, monkeypatch):
|
|
"""First busy-while-running message gets an extra hint about /busy."""
|
|
import gateway.run as _gr
|
|
|
|
monkeypatch.setattr(_gr, "_hermes_home", tmp_path)
|
|
# mark_seen imports utils.atomic_yaml_write; make sure it resolves
|
|
# against a writable dir by pointing _hermes_home at tmp_path.
|
|
monkeypatch.setattr(_gr, "_load_gateway_config", lambda: {})
|
|
|
|
runner, _sentinel = _make_runner()
|
|
runner._busy_input_mode = "interrupt"
|
|
adapter = _make_adapter()
|
|
|
|
event = _make_event(text="ping")
|
|
sk = build_session_key(event.source)
|
|
|
|
agent = MagicMock()
|
|
agent.get_activity_summary.return_value = {
|
|
"api_call_count": 3, "max_iterations": 60,
|
|
"current_tool": None, "last_activity_ts": time.time(),
|
|
"last_activity_desc": "api", "seconds_since_activity": 0.1,
|
|
}
|
|
runner._running_agents[sk] = agent
|
|
runner._running_agents_ts[sk] = time.time() - 5
|
|
runner.adapters[event.source.platform] = adapter
|
|
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
adapter._send_with_retry.assert_called_once()
|
|
|
|
# The flag is now persisted to tmp_path/config.yaml
|
|
import hermes_yaml as yaml
|
|
cfg = yaml.safe_load((tmp_path / "config.yaml").read_text())
|
|
assert cfg["onboarding"]["seen"]["busy_input_prompt"] is True
|
|
|
|
|
|
class TestLongRunningNotificationOwnership:
|
|
"""The long-running heartbeat must stop once its run no longer owns the
|
|
session slot or the executor finished — otherwise a stale
|
|
'running: delegate_task' bubble outlives the run that spawned it (#12029).
|
|
"""
|
|
|
|
def test_notification_stops_after_session_ownership_moves(self):
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._running_agents = {}
|
|
|
|
original_agent = MagicMock()
|
|
replacement_agent = MagicMock()
|
|
runner._running_agents["sess"] = replacement_agent
|
|
|
|
assert runner._should_emit_long_running_notification(
|
|
"sess", original_agent, executor_task=None
|
|
) is False
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_restart_during_heartbeat_edit_sends_no_fallback_bubble(self, monkeypatch):
|
|
"""The guard is rechecked after the awaited edit: a restart that begins while the edit is
|
|
in flight must not be followed by a fresh "Working" send when that edit fails (#10990)."""
|
|
import asyncio
|
|
from types import SimpleNamespace
|
|
from gateway.run import GatewayRunner
|
|
from gateway.turn_context import TurnContext
|
|
|
|
monkeypatch.setenv("HERMES_AGENT_NOTIFY_INTERVAL", "0.01")
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._running_agents = {}
|
|
runner._draining = runner._restart_requested = False
|
|
adapter = MagicMock()
|
|
first_send = AsyncMock(return_value=SimpleNamespace(success=True, message_id="hb-1"))
|
|
adapter.send = first_send
|
|
|
|
async def _edit_then_restart(*a, **k):
|
|
runner._restart_requested = True # restart notice goes out while the edit is awaited
|
|
return SimpleNamespace(success=False)
|
|
|
|
adapter.edit_message = AsyncMock(side_effect=_edit_then_restart)
|
|
runner._delivery_adapter_for = lambda source: adapter
|
|
runner._agent_activity_summary = staticmethod(lambda agent: None)
|
|
agent = MagicMock()
|
|
runner._running_agents["sess"] = agent
|
|
disp = MagicMock()
|
|
disp._display_surface_mode.return_value = "on"
|
|
disp.resolve_display_setting.return_value = False
|
|
ctx = TurnContext(source=SimpleNamespace(chat_id="c", platform="telegram"), session_key="sess")
|
|
ctx.agent_holder[0] = agent
|
|
|
|
await asyncio.wait_for(runner._run_agent_notify_long_running(disp, ctx, [None]), 5)
|
|
|
|
assert first_send.await_count == 1 # the original heartbeat only
|
|
adapter.edit_message.assert_awaited_once()
|
|
|
|
@pytest.mark.parametrize("flag", ["_draining", "_restart_requested"])
|
|
def test_notification_stops_once_shutdown_or_restart_begins(self, flag):
|
|
"""After the restart/shutdown notice a heartbeat would contradict it (#10990)."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._running_agents = {}
|
|
agent = MagicMock()
|
|
runner._running_agents["sess"] = agent
|
|
assert runner._should_emit_long_running_notification("sess", agent, executor_task=None) is True
|
|
setattr(runner, flag, True)
|
|
assert runner._should_emit_long_running_notification("sess", agent, executor_task=None) is False
|
|
|
|
|