mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-11 13:41:53 +00:00
abc349bd79
A cron job with a per-job `workdir` overrides the process-global `os.environ["TERMINAL_CWD"]` for the entire duration of its agent run and restores it afterwards. The scheduler dispatches workdir jobs on a single-thread sequential pool and workdir-less jobs on a separate parallel pool, and the in-code comments claimed this made the override safe. That only prevents two workdir jobs from overlapping each other. The two pools run concurrently in the same process and share `os.environ`, so while a workdir job has `TERMINAL_CWD` pointed at its project directory, any workdir-less job firing in the same window reads that same global through the terminal, file, and code-exec tools and runs its commands in the wrong directory. The corruption window spans the whole workdir-job run, and a file write or delete can land in another job's tree. This serializes the override with a writer-preferring readers-writer lock. Workdir jobs acquire it as writers (exclusive for their whole run); workdir- less jobs acquire it as readers, so they still run in parallel with each other but never alongside a workdir job's override. The guarantee is based on run overlap rather than tick boundaries, so it also holds when a workdir job spans ticks. ## What does this PR do? Fixes a directory-isolation bug in the cron scheduler: a workdir cron job's process-global `TERMINAL_CWD` override could be observed by a concurrently running workdir-less cron job, causing that job's shell/file/code-exec commands to execute in the wrong directory. ## Related Issue N/A ## Type of Change - [x] 🐛 Bug fix (non-breaking change that fixes an issue) - [ ] ✨ New feature (non-breaking change that adds functionality) - [ ] 🔒 Security fix - [ ] 📝 Documentation update - [ ] ✅ Tests (adding or improving test coverage) - [ ] ♻️ Refactor (no behavior change) - [ ] 🎯 New skill (bundled or hub) ## Changes Made - `cron/scheduler.py`: add `_ReadWriteLock` (writer-preferring) and the module-global `_terminal_cwd_lock`. - `cron/scheduler.py`: in `run_job`, acquire the lock as a writer for workdir jobs and as a reader for workdir-less jobs, spanning the `TERMINAL_CWD` override and its restore in the `finally` block. - `cron/scheduler.py`: correct the stale comments in `run_job` and `tick` that claimed the sequential pool alone made the override safe. - `tests/cron/test_terminal_cwd_lock.py`: new tests for reader concurrency, writer exclusion, and the no-cross-observation regression. ## How to Test 1. `python -m pytest tests/cron/test_terminal_cwd_lock.py -q` — the regression test `test_reader_never_observes_writer_override` fails without the lock and passes with it. 2. `python -m pytest tests/cron/test_cron_workdir.py tests/cron/test_parallel_pool.py -q` — confirms the existing `TERMINAL_CWD` set/restore and pool behaviour are unchanged. ## Checklist ### Code - [x] I've read the Contributing Guide - [x] My commit messages follow Conventional Commits (`fix(scope):`, etc.) - [x] I searched for existing PRs to make sure this isn't a duplicate - [x] My PR contains only changes related to this fix - [x] I've run the affected `tests/cron/` suites and all tests pass - [x] I've added tests for my changes (required for bug fixes) - [x] I've tested on my platform: macOS 15 (Darwin 25.5) ### Documentation & Housekeeping - [x] I've updated relevant documentation (docstrings/comments) — or N/A - [x] I've updated `cli-config.yaml.example` if I added/changed config keys — N/A - [x] I've updated `CONTRIBUTING.md` or `AGENTS.md` if I changed architecture — N/A - [x] I've considered cross-platform impact (Windows, macOS) — uses stdlib `threading` only - [x] I've updated tool descriptions/schemas if I changed tool behavior — N/A |
||
|---|---|---|
| .. | ||
| acp | ||
| acp_adapter | ||
| agent | ||
| ci | ||
| cli | ||
| computer_use | ||
| cron | ||
| docker | ||
| e2e | ||
| fakes | ||
| fixtures/plugins/example-dashboard/dashboard | ||
| gateway | ||
| hermes_cli | ||
| hermes_state | ||
| honcho_plugin | ||
| integration | ||
| openviking_plugin | ||
| plugins | ||
| providers | ||
| run_agent | ||
| scripts | ||
| skills | ||
| stress | ||
| tools | ||
| tui_gateway | ||
| website | ||
| __init__.py | ||
| conftest.py | ||
| run_interrupt_test.py | ||
| test_account_usage.py | ||
| test_assistant_ui_tap_compat.py | ||
| test_atomic_replace_symlinks.py | ||
| test_base_url_hostname.py | ||
| test_batch_runner_checkpoint.py | ||
| test_bitwarden_secrets.py | ||
| test_cli_file_drop.py | ||
| test_cli_manual_compress.py | ||
| test_cli_skin_integration.py | ||
| test_code_skew.py | ||
| test_ctx_halving_fix.py | ||
| test_dashboard_sidecar_close_on_disconnect.py | ||
| test_delegate_cascade_49148.py | ||
| test_desktop_electron_pin.py | ||
| test_desktop_mac_entitlements.py | ||
| test_dispatch_session_id.py | ||
| test_empty_model_fallback.py | ||
| test_empty_session_hygiene.py | ||
| test_env_loader_secret_sources.py | ||
| test_evidence_store.py | ||
| test_fast_safe_load.py | ||
| test_gateway_streaming_nested_config.py | ||
| test_get_tool_definitions_cache_isolation.py | ||
| test_hermes_bootstrap.py | ||
| test_hermes_constants.py | ||
| test_hermes_home_profile_warning.py | ||
| test_hermes_logging.py | ||
| test_hermes_state.py | ||
| test_hermes_state_compression_locks.py | ||
| test_hermes_state_wal_fallback.py | ||
| test_honcho_client_concurrency.py | ||
| test_honcho_client_config.py | ||
| test_honcho_session_context.py | ||
| test_honcho_startup_fail_open.py | ||
| test_install_diverged_update.py | ||
| test_install_lockfile_churn.py | ||
| test_install_no_initial_commit.py | ||
| test_install_ps1_native_stderr_eap.py | ||
| test_install_ps1_python_fallback_venv.py | ||
| test_install_ps1_uv_powershell_host.py | ||
| test_install_sh_browser_install.py | ||
| test_install_sh_install_method_stamp.py | ||
| test_install_sh_node_global_prefix.py | ||
| test_install_sh_pythonpath_sanitization.py | ||
| test_install_sh_root_fhs_uv_python_path.py | ||
| test_install_sh_setup_wizard_tty_probe.py | ||
| test_install_sh_symlink_stomp.py | ||
| test_install_sh_termux_network_prereqs.py | ||
| test_install_unmerged_index.py | ||
| test_ipv4_preference.py | ||
| test_lazy_session_regressions.py | ||
| test_lint_config.py | ||
| test_live_system_guard_self_test.py | ||
| test_mcp_serve.py | ||
| test_mini_swe_runner.py | ||
| test_minimax_model_validation.py | ||
| test_minimax_oauth.py | ||
| test_minisweagent_path.py | ||
| test_model_forces_max_completion_tokens.py | ||
| test_model_picker_scroll.py | ||
| test_model_tools.py | ||
| test_model_tools_async_bridge.py | ||
| test_ollama_num_ctx.py | ||
| test_output_cap_parsing.py | ||
| test_package_json_lazy_deps.py | ||
| test_packaging_metadata.py | ||
| test_plugin_skills.py | ||
| test_plugin_utils.py | ||
| test_process_loop_event_loop_warning.py | ||
| test_profile_isolation_runtime.py | ||
| test_project_metadata.py | ||
| test_retry_utils.py | ||
| test_run_tests_parallel.py | ||
| test_sanitize_tool_error.py | ||
| test_setup_temporary_outputs.py | ||
| test_slash_worker_watchdog.py | ||
| test_sql_injection.py | ||
| test_stale_utils_module_import.py | ||
| test_state_db_malformed_repair.py | ||
| test_subprocess_home_isolation.py | ||
| test_termux_all_extra_compat.py | ||
| test_timezone.py | ||
| test_toolset_distributions.py | ||
| test_toolsets.py | ||
| test_trajectory_compressor.py | ||
| test_trajectory_compressor_async.py | ||
| test_transform_llm_output_hook.py | ||
| test_transform_tool_result_hook.py | ||
| test_tui_gateway_loop_noise.py | ||
| test_tui_gateway_queue_on_busy.py | ||
| test_tui_gateway_server.py | ||
| test_tui_gateway_ws.py | ||
| test_tui_mcp_late_refresh.py | ||
| test_utils_truthy_values.py | ||
| test_web_server.py | ||
| test_wheel_locales_e2e.py | ||
| test_windows_subprocess_no_window_flags.py | ||
| test_yaml_indent_consistency_31999.py | ||
| test_yuanbao_integration.py | ||
| test_yuanbao_markdown.py | ||
| test_yuanbao_pipeline.py | ||
| test_yuanbao_proto.py | ||
| test_yuanbao_shutdown.py | ||