ethernet
a6ae6ace51
Merge remote-tracking branch 'origin/main' into ethie/pm-clean
# Conflicts:
# .github/workflows/js-tests.yml
# agent/model_metadata.py
# apps/desktop/electron/main.ts
# apps/desktop/scripts/bundle-electron-main.mjs
# apps/desktop/src/app/settings/about-settings.tsx
# apps/desktop/src/app/settings/gateway-settings.test.tsx
# apps/desktop/src/app/settings/gateway-settings.tsx
# apps/desktop/src/app/updates-overlay.tsx
# gateway/shutdown_flush.py
# hermes_bootstrap.py
# hermes_cli/local_runtime/binaries.py
# hermes_cli/main.py
# hermes_cli/managed_uv.py
# hermes_cli/update_cmd.py
# hermes_cli/update_cmd_deps.py
# hermes_cli/update_cmd_fleet.py
# hermes_cli/update_cmd_maint.py
# hermes_cli/update_receipt.py
# hermes_cli/update_serve_obligations.py
# hermes_constants.py
# tests/hermes_cli/test_doctor.py
# tests/hermes_cli/test_managed_uv.py
# tests/hermes_cli/test_pending_supervisor_recovery.py
# tests/hermes_cli/test_startup_fast_guards.py
# tests/hermes_cli/test_update_desktop_stale_warning.py
# tests/hermes_cli/test_update_fleet_restart_pending.py
# tests/hermes_state/test_hermes_state.py
# tests/tools/test_tirith_security.py
# tools/bot_relay.py
# tools/checkpoint_manager.py
# tools/write_approval.py
# website/docs/getting-started/updating.md
# website/docs/reference/environment-variables.md