mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +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
206 lines
8.8 KiB
Python
206 lines
8.8 KiB
Python
"""Honesty of the manual-run delivery notice (issue #83993).
|
|
|
|
A manual ``cronjob(action='run')`` finishes with a completion summary line
|
|
|
|
Delivery target: <target> (output was delivered there by the job itself)
|
|
|
|
that was appended UNCONDITIONALLY for non-local targets — even when
|
|
``run_one_job`` had just written ``last_delivery_error`` onto the refreshed
|
|
job record because the post-run delivery (telegram/discord/…) failed. The
|
|
calling agent then relayed "all good" over a failed delivery.
|
|
|
|
The note must follow the refreshed job record: a set ``last_delivery_error``
|
|
means delivery FAILED with the error text surfaced; an empty/missing error
|
|
keeps the legacy wording byte-for-byte (zero regression), and local jobs
|
|
always say saved-locally.
|
|
"""
|
|
|
|
import contextlib
|
|
import time
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from tools.cronjob_tools import _manual_run_delivery_note
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _clean_state():
|
|
"""Reset the shared async-delegation world around each test.
|
|
|
|
The dispatch tests below submit real workers onto the process-wide
|
|
daemon executor in ``tools.async_delegation``. A finished worker parks
|
|
idle holding an ``_idle_semaphore`` token, so the NEXT dispatch in this
|
|
process REUSES that thread instead of spawning a fresh one — and only
|
|
the fresh-spawn path keeps upstream's dispatch-and-return test winning
|
|
its patch-visibility race: ``Thread.start()`` blocks the dispatching
|
|
thread until the worker has bootstrapped, so the worker performs
|
|
``_run_claimed_job``'s lazy ``from cron.scheduler import run_one_job``
|
|
while the test's patches are still active. On the idle-reuse path
|
|
``submit`` returns with the GIL still held, the patch block unwinds
|
|
first, and the worker binds the REAL ``run_one_job`` — which then runs
|
|
the fake job for real ("no model configured") and the mock never fires.
|
|
Without this reset, test_cronjob_run_background.py's
|
|
``test_dispatches_and_returns_handle_immediately`` fails
|
|
deterministically whenever this file runs before it. Mirrors
|
|
``tests/tools/test_async_delegation.py::_clean_state``.
|
|
"""
|
|
from tools import async_delegation as ad
|
|
from tools.process_registry import process_registry
|
|
|
|
ad._reset_for_tests()
|
|
while not process_registry.completion_queue.empty():
|
|
process_registry.completion_queue.get_nowait()
|
|
yield
|
|
# Give just-drained workers a beat to finalize BEFORE resetting, so
|
|
# their completion events land now instead of leaking into the next
|
|
# test's queue (mirrors test_async_delegation.py).
|
|
deadline = time.monotonic() + 2.0
|
|
while ad.active_count() and time.monotonic() < deadline:
|
|
time.sleep(0.02)
|
|
ad._reset_for_tests()
|
|
while not process_registry.completion_queue.empty():
|
|
process_registry.completion_queue.get_nowait()
|
|
|
|
def _job(job_id, deliver):
|
|
"""Per-test job dict with a UNIQUE id.
|
|
|
|
Background workers outlive their test (daemon executor) and hold the id
|
|
in the scheduler's shared running set until the run finishes; reusing an
|
|
id across tests trips the in-flight dedupe guard on a straggler.
|
|
"""
|
|
return {
|
|
"id": job_id,
|
|
"name": f"dn run {job_id}",
|
|
"prompt": "hi",
|
|
"schedule": {"kind": "cron", "expr": "0 9 * * *"},
|
|
"deliver": deliver,
|
|
}
|
|
|
|
@contextlib.contextmanager
|
|
def _bound_session_key(key):
|
|
"""Bind the approval session key contextvar (background dispatch gate)."""
|
|
from tools.approval_context import _approval_session_key
|
|
|
|
token = _approval_session_key.set(key)
|
|
try:
|
|
yield
|
|
finally:
|
|
_approval_session_key.reset(token)
|
|
|
|
def _dispatch_diag(res) -> str:
|
|
"""Failure renderer for the wiring tests' dispatch asserts: the result
|
|
dict plus the scheduler running set, so a broken assert names the return
|
|
path that was actually taken instead of a bare KeyError."""
|
|
try:
|
|
from cron.scheduler import get_running_job_ids
|
|
|
|
running = sorted(get_running_job_ids())
|
|
except Exception as e: # pragma: no cover - diagnostic only
|
|
running = f"<unavailable: {e}>"
|
|
return f"dispatch result: {res!r}; running: {running}"
|
|
|
|
def _drain_completion_event(delegation_id):
|
|
"""Wait (bounded) for this delegation's completion event; requeue others.
|
|
|
|
The runner executes on a daemon thread, so this must be called while the
|
|
test's patches are still active.
|
|
"""
|
|
from tools.process_registry import process_registry
|
|
|
|
for _ in range(100):
|
|
try:
|
|
evt = process_registry.completion_queue.get_nowait()
|
|
except Exception:
|
|
time.sleep(0.05)
|
|
continue
|
|
if evt.get("delegation_id") == delegation_id:
|
|
return evt
|
|
process_registry.completion_queue.put(evt)
|
|
time.sleep(0.05)
|
|
return None
|
|
|
|
class TestDeliveryNote:
|
|
"""``_manual_run_delivery_note`` — the summary-line wording contract."""
|
|
|
|
def test_local_always_saved_locally_only(self):
|
|
expected = " (output saved locally only)"
|
|
assert _manual_run_delivery_note("local", {}) == expected
|
|
# Local jobs never deliver — a stale delivery error must not leak in.
|
|
assert (
|
|
_manual_run_delivery_note("local", {"last_delivery_error": "telegram 400"})
|
|
== expected
|
|
)
|
|
|
|
def test_whitespace_deliver_defers_to_error_record(self):
|
|
"""Whitespace-only deliver is NOT folded into local: fire time lets it
|
|
through as a target that fails to resolve, so the recorded error must
|
|
stay visible rather than being masked by a saved-locally wording."""
|
|
note = _manual_run_delivery_note(" ", {"last_delivery_error": "no target"})
|
|
assert "delivery FAILED" in note
|
|
assert "no target" in note
|
|
|
|
class TestRunnerSummaryWiring:
|
|
"""The completion event the calling agent actually sees must follow the
|
|
refreshed job record — both directions of issue #83993."""
|
|
|
|
def test_delivery_failure_surfaces_in_completion_summary(self):
|
|
from tools.cronjob_tools import _try_dispatch_background_run
|
|
|
|
job = _job("job-dn-01", "telegram")
|
|
with _bound_session_key("agent:main:telegram:dm:83993"):
|
|
with (
|
|
patch(
|
|
"tools.cronjob_tools.claim_job_for_fire",
|
|
return_value=job, # claimed snapshot (return_job=True API)
|
|
),
|
|
patch("cron.scheduler.run_one_job", return_value=True),
|
|
patch(
|
|
"tools.cronjob_tools.get_job",
|
|
return_value={
|
|
# Post-#83993 record shape: mark_job_run writes
|
|
# delivery_failed (not ok) when only delivery failed.
|
|
"last_status": "delivery_failed",
|
|
"last_error": None,
|
|
"last_delivery_error": "telegram send failed: 400",
|
|
},
|
|
),
|
|
):
|
|
res = _try_dispatch_background_run(job)
|
|
assert res.get("dispatched") is True, _dispatch_diag(res)
|
|
evt = _drain_completion_event(res["delegation_id"])
|
|
assert evt is not None, "completion event never reached the queue"
|
|
summary = evt.get("summary") or ""
|
|
assert "Delivery target: telegram" in summary
|
|
assert "delivery FAILED" in summary
|
|
assert "telegram send failed: 400" in summary
|
|
assert "delivered there by the job itself" not in summary
|
|
# The headline must not read "Result: ok" over an undelivered run.
|
|
assert "Result: FAILED" in summary
|
|
assert "Result: ok" not in summary
|
|
|
|
def test_empty_deliver_summary_states_local_not_phantom_target(self):
|
|
"""End-to-end: an empty stored deliver must render as the local target
|
|
it behaves as at fire time — never a bare "Delivery target: " followed
|
|
by a delivered-there claim."""
|
|
from tools.cronjob_tools import _try_dispatch_background_run
|
|
|
|
job = _job("job-dn-03", "")
|
|
with _bound_session_key("agent:main:telegram:dm:86622"):
|
|
with (
|
|
patch(
|
|
"tools.cronjob_tools.claim_job_for_fire",
|
|
return_value=job, # claimed snapshot (return_job=True API)
|
|
),
|
|
patch("cron.scheduler.run_one_job", return_value=True),
|
|
patch(
|
|
"tools.cronjob_tools.get_job",
|
|
return_value={"last_status": "ok", "last_error": None},
|
|
),
|
|
):
|
|
res = _try_dispatch_background_run(job)
|
|
assert res.get("dispatched") is True, _dispatch_diag(res)
|
|
evt = _drain_completion_event(res["delegation_id"])
|
|
assert evt is not None, "completion event never reached the queue"
|
|
summary = evt.get("summary") or ""
|
|
assert "Delivery target: local (output saved locally only)" in summary
|
|
assert "delivered there by the job itself" not in summary
|