# 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
166 lines
6.6 KiB
Python
166 lines
6.6 KiB
Python
"""Regression for #49225 — codex app-server turns must reach the session DB
|
|
exactly once.
|
|
|
|
The codex app-server runtime (``run_codex_app_server_turn``) is an early-return
|
|
path that bypasses ``conversation_loop`` and therefore never runs the loop's
|
|
per-step ``_persist_session()`` flushes. Before the fix, the projected
|
|
assistant/tool messages were persisted *nowhere* (state.db got only
|
|
session_meta rows), leaving ``session_search`` (FTS) and conversation-distill
|
|
blind to real gateway conversations.
|
|
|
|
The fix has the codex runtime flush its own projected messages via
|
|
``_flush_messages_to_session_db()`` (idempotent through the intrinsic
|
|
``_DB_PERSISTED_MARKER``) and return ``agent_persisted=True`` so the gateway
|
|
skips its own ``append_to_transcript`` DB write. This is critical: the inbound
|
|
user turn is already flushed at turn start (``turn_context._persist_session``),
|
|
and ``append_message`` is a raw INSERT with no dedup — a gateway re-write would
|
|
duplicate the user turn (#860 / #42039). This test locks in:
|
|
|
|
1. ``run_codex_app_server_turn`` flushes projected messages and returns
|
|
``agent_persisted=True``.
|
|
2. Exactly-once persistence: the already-flushed user turn is NOT re-written,
|
|
and the new projected assistant message lands once.
|
|
3. The gateway resolution expression preserves standard-runtime behaviour.
|
|
"""
|
|
|
|
import tempfile
|
|
from pathlib import Path
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock
|
|
|
|
from agent.codex_runtime import run_codex_app_server_turn
|
|
from hermes_state import SessionDB
|
|
from run_agent import AIAgent
|
|
|
|
def _make_turn():
|
|
return SimpleNamespace(
|
|
interrupted=False,
|
|
error=None,
|
|
thread_id="thread-1",
|
|
turn_id="turn-1",
|
|
projected_messages=[{"role": "assistant", "content": "CODEX_ASSISTANT"}],
|
|
tool_iterations=0,
|
|
final_text="CODEX_ASSISTANT",
|
|
should_retire=False,
|
|
)
|
|
|
|
def _make_agent(session_db=None, session_id="sess-codex"):
|
|
agent = MagicMock()
|
|
# Pre-seed the session so run_codex_app_server_turn skips the spawn block.
|
|
agent._codex_session = MagicMock()
|
|
agent._codex_session.run_turn.return_value = _make_turn()
|
|
agent._codex_session_prompt = None # seeded session: no recorded composition to compare
|
|
agent.tool_progress_callback = None
|
|
agent._iters_since_skill = 0
|
|
agent._skill_nudge_interval = 0
|
|
agent.valid_tool_names = set()
|
|
agent._session_db = session_db
|
|
agent._session_db_created = True
|
|
agent.session_id = session_id
|
|
return agent
|
|
|
|
def test_codex_success_flushes_and_reports_persisted():
|
|
"""Codex success turn must self-persist and return agent_persisted=True."""
|
|
agent = _make_agent(session_db=None) # no DB -> flush is a no-op, still True
|
|
result = run_codex_app_server_turn(
|
|
agent,
|
|
user_message="hello",
|
|
original_user_message="hello",
|
|
messages=[{"role": "user", "content": "hello"}],
|
|
effective_task_id="task-1",
|
|
)
|
|
assert result["completed"] is True
|
|
assert isinstance(result["messages"][-1]["timestamp"], float)
|
|
# With the agent as sole persister, the gateway must SKIP its DB write.
|
|
assert result["agent_persisted"] is True
|
|
|
|
def test_codex_user_interrupt_is_reported_and_cleared():
|
|
agent = _make_agent(session_db=None)
|
|
turn = _make_turn()
|
|
turn.interrupted = True
|
|
turn.final_text = ""
|
|
agent._codex_session.run_turn.return_value = turn
|
|
agent._interrupt_requested = True
|
|
agent._interrupt_message = "new correction"
|
|
|
|
def clear_interrupt():
|
|
agent._interrupt_requested = False
|
|
agent._interrupt_message = None
|
|
|
|
agent.clear_interrupt.side_effect = clear_interrupt
|
|
result = run_codex_app_server_turn(
|
|
agent,
|
|
user_message="hello",
|
|
original_user_message="hello",
|
|
messages=[{"role": "user", "content": "hello"}],
|
|
effective_task_id="task-1",
|
|
)
|
|
|
|
assert result["interrupted"] is True
|
|
assert result["interrupt_message"] == "new correction"
|
|
agent.clear_interrupt.assert_called_once_with()
|
|
assert agent._interrupt_requested is False
|
|
|
|
def test_codex_turn_persists_each_message_exactly_once():
|
|
"""The user turn (flushed at turn start) must not be duplicated; the
|
|
projected assistant message must land once. Uses a real SessionDB and the
|
|
real AIAgent._flush_messages_to_session_db to prove no #860/#42039
|
|
duplicate-write regression on the codex path."""
|
|
tmp = tempfile.mkdtemp(prefix="codex_persist_")
|
|
db = None
|
|
try:
|
|
db = SessionDB(Path(tmp) / "state.db")
|
|
sid = "sess-codex-once"
|
|
db.create_session(session_id=sid, source="telegram", model="codex")
|
|
|
|
# Real agent bound to this DB/session, minimal construction.
|
|
agent = AIAgent(
|
|
api_key="test-key",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
session_db=db,
|
|
session_id=sid,
|
|
)
|
|
agent._session_db_created = True
|
|
agent._codex_session = MagicMock()
|
|
agent._codex_session.run_turn.return_value = _make_turn()
|
|
agent.tool_progress_callback = None
|
|
|
|
# Model the real flow: the inbound user turn is flushed at turn start
|
|
# (turn_context._persist_session) on the SAME `messages` list the codex
|
|
# path later reuses. That flush stamps _DB_PERSISTED_MARKER on the user
|
|
# dict, so the codex-path flush skips it — no duplicate.
|
|
user_msg = {"role": "user", "content": "USER_TURN"}
|
|
messages = [user_msg]
|
|
agent._flush_messages_to_session_db(messages) # turn-start flush
|
|
|
|
result = run_codex_app_server_turn(
|
|
agent,
|
|
user_message="USER_TURN",
|
|
original_user_message="USER_TURN",
|
|
messages=messages,
|
|
effective_task_id="task-1",
|
|
)
|
|
assert result["agent_persisted"] is True
|
|
|
|
rows = db.get_messages(sid, include_inactive=True)
|
|
contents = [r["content"] for r in rows]
|
|
# Exactly one user turn, exactly one assistant turn — no duplicates.
|
|
assert contents.count("USER_TURN") == 1, contents
|
|
assert contents.count("CODEX_ASSISTANT") == 1, contents
|
|
assistant_row = next(
|
|
row for row in rows if row["content"] == "CODEX_ASSISTANT"
|
|
)
|
|
assert isinstance(assistant_row["timestamp"], float)
|
|
# session_search can now see the codex conversation.
|
|
hits = {r["session_id"] for r in db.search_messages("CODEX_ASSISTANT")}
|
|
assert sid in hits
|
|
finally:
|
|
import shutil
|
|
|
|
if db is not None:
|
|
db.close()
|
|
shutil.rmtree(tmp, ignore_errors=True)
|