ethernet
e97de8d8c3
Merge branch 'ethie/windows-tests' into ethie/pm-clean
# Conflicts:
# .gitignore
# agent/deadline.py
# pyproject.toml
# scripts/run_tests.sh
# tests/agent/lsp/test_install_and_lint_fixes.py
# tests/cron/test_file_permissions.py
# tests/cron/test_media_delivery_parity.py
# tests/cron/test_script_claim_heartbeat.py
# tests/hermes_cli/test_dep_ensure.py
# tests/hermes_cli/test_gateway_wsl.py
# tests/hermes_cli/test_linux_desktop_entry.py
# tests/hermes_cli/test_npm_engine.py
# tests/hermes_cli/test_runtime_repair.py
# tests/hermes_cli/test_tui_npm_install.py
# tests/test_hermes_constants.py
# tests/test_install_autostash_conflict_recovery.py
# tests/test_install_macos_launcher.py
# tests/test_install_sh_acp_launcher.py
# tests/test_install_sh_bootstrap_marker.py
# tests/test_install_sh_node_deps_failure.py
# tests/test_install_sh_symlink_stomp.py
# tests/test_windows_subprocess_no_window_flags.py
# tests/tools/test_approval_timeout_overflow.py
# tests/tools/test_browser_homebrew_paths.py
# tests/tools/test_find_shell.py
# tests/tools/test_lazy_deps.py
# tests/tools/test_lazy_deps_durable_target.py
# tools/approval.py
# uv.lock