Upstream sync conflict 2026-07-20

[github-actions]

Weekly merge of upstream/main hit conflicts in:

.github/actions/detect-changes/action.yml
.github/workflows/ci.yml
agent/agent_runtime_helpers.py
agent/chat_completion_helpers.py
agent/context_compressor.py
agent/conversation_compression.py
agent/conversation_loop.py
agent/replay_cleanup.py
agent/system_prompt.py
agent/transports/chat_completions.py
agent/turn_context.py
apps/desktop/electron/bootstrap-runner.test.ts
apps/desktop/electron/bootstrap-runner.ts
apps/desktop/electron/git-review-ops.test.ts
apps/desktop/electron/main.ts
apps/desktop/electron/windows-system-ca.ts
apps/desktop/electron/zoom.test.ts
apps/desktop/electron/zoom.ts
apps/desktop/scripts/write-build-stamp.mjs
apps/desktop/src/app/chat/composer/model-pill.test.tsx
apps/desktop/src/app/chat/composer/model-pill.tsx
apps/desktop/src/app/chat/pane-mirror.ts
apps/desktop/src/app/chat/session-tile.tsx
apps/desktop/src/app/chat/session-view.tsx
apps/desktop/src/app/chat/sidebar/projects/workspace-groups.test.ts
apps/desktop/src/app/chat/sidebar/projects/workspace-groups.ts
apps/desktop/src/app/chat/sidebar/session-actions-menu.tsx
apps/desktop/src/app/chat/sidebar/session-row.tsx
apps/desktop/src/app/contrib/controller.tsx
apps/desktop/src/app/contrib/wiring.tsx
apps/desktop/src/app/cron/cron-job-model.test.ts
apps/desktop/src/app/cron/cron-job-model.ts
apps/desktop/src/app/cron/index.tsx
apps/desktop/src/app/gateway/hooks/use-gateway-boot.ts
apps/desktop/src/app/overlays/panel.tsx
apps/desktop/src/app/session/hooks/use-message-stream/gateway-event.ts
apps/desktop/src/app/session/hooks/use-model-controls.test.tsx
apps/desktop/src/app/session/hooks/use-model-controls.ts
apps/desktop/src/app/session/hooks/use-session-actions.test.tsx
apps/desktop/src/app/session/hooks/use-session-actions/index.ts
apps/desktop/src/app/session/hooks/use-session-actions/utils.test.ts
apps/desktop/src/app/session/hooks/use-session-actions/utils.ts
apps/desktop/src/app/session/hooks/use-session-list-actions.ts
apps/desktop/src/app/session/hooks/use-session-state-cache.ts
apps/desktop/src/app/settings/config-settings.tsx
apps/desktop/src/app/settings/constants.ts
apps/desktop/src/app/settings/helpers.ts
apps/desktop/src/app/settings/index.tsx
apps/desktop/src/app/settings/model-settings.test.tsx
apps/desktop/src/app/settings/model-settings.tsx
apps/desktop/src/app/settings/provider-config-panel.test.tsx
apps/desktop/src/app/settings/providers-settings.tsx
apps/desktop/src/app/settings/toolset-config-panel.tsx
apps/desktop/src/app/shell/hooks/use-statusbar-items.tsx
apps/desktop/src/app/shell/model-menu-panel.test.tsx
apps/desktop/src/app/skills/index.tsx
apps/desktop/src/app/starmap/share-controls.tsx
apps/desktop/src/components/assistant-ui/markdown-text.tsx
apps/desktop/src/components/pane-shell/tree/renderer/track-model.ts
apps/desktop/src/components/pane-shell/tree/renderer/tree-group.tsx
apps/desktop/src/components/pane-shell/tree/renderer/tree-split.tsx
apps/desktop/src/components/pane-shell/tree/store.ts
apps/desktop/src/components/ui/dialog.tsx
apps/desktop/src/components/ui/tooltip.test.tsx
apps/desktop/src/contrib/plugin.ts
apps/desktop/src/hermes.ts
apps/desktop/src/i18n/en.ts
apps/desktop/src/i18n/zh.ts
apps/desktop/src/lib/model-options.test.ts
apps/desktop/src/lib/query-client.ts
apps/desktop/src/main.tsx
apps/desktop/src/sdk/index.ts
apps/desktop/src/store/composer-status.ts
apps/desktop/src/store/gateway-switch.test.ts
apps/desktop/src/store/gateway-switch.ts
apps/desktop/src/store/session-states.ts
apps/desktop/src/store/session.ts
apps/desktop/src/store/updates.test.ts
apps/desktop/src/store/updates.ts
apps/desktop/tsconfig.json
apps/desktop/vite.config.ts
apps/desktop/vitest.setup.ts
apps/shared/src/index.ts
cli.py
cron/jobs.py
gateway/config.py
gateway/platforms/api_server.py
gateway/run.py
gateway/session.py
gateway/slash_commands.py
gateway/status.py
hermes_cli/commands.py
hermes_cli/config.py
hermes_cli/main.py
hermes_cli/model_switch.py
hermes_cli/tools_config.py
hermes_cli/web_server.py
hermes_state.py
plugins/platforms/discord/adapter.py
plugins/platforms/slack/adapter.py
plugins/platforms/telegram/adapter.py
run_agent.py
scripts/ci/timings_report.py
scripts/install.ps1
scripts/release.py
skills/hermes-desktop-plugins/SKILL.md
skills/hermes-desktop-plugins/templates/plugin.js
tests/agent/test_bedrock_interrupt_post_worker.py
tests/agent/test_compression_concurrent_fork.py
tests/agent/test_compression_rotation_state.py
tests/agent/test_turn_overlap_tripwire.py
tests/cron/test_jobs.py
tests/gateway/test_10710_auto_reset_evicts_cached_agent.py
tests/gateway/test_config.py
tests/gateway/test_discord_approval_mentions.py
tests/gateway/test_image_input_routing_runtime.py
tests/gateway/test_multiplex_adapter_registry.py
tests/gateway/test_session.py
tests/hermes_cli/test_gateway_service.py
tests/hermes_cli/test_inventory.py
tests/hermes_cli/test_tui_resume_flow.py
tests/hermes_cli/test_web_server.py
tests/run_agent/test_stream_stale_circuit_breaker.py
tests/run_agent/test_streaming.py
tests/test_hermes_state.py
tests/test_tui_gateway_server.py
tests/tools/test_vision_tools.py
tests/tui_gateway/test_protocol.py
tools/approval.py
tools/computer_use/cua_backend.py
tools/delegate_tool.py
tools/mcp_stdio_watchdog.py
tools/mcp_tool.py
tools/vision_tools.py
tools/web_tools.py
tui_gateway/compute_host.py
tui_gateway/server.py
tui_gateway/slash_worker.py
ui-tui/src/app/slash/commands/session.ts
ui-tui/src/app/useMainApp.ts
website/sidebars.ts

Resolve locally:

git fetch upstream main
git checkout -b upstream-sync-20260720 origin/main
git merge upstream/main   # resolve the files above
uv lock                   # if pyproject changed
# run the full suite, then open a PR to main