Upstream sync conflict 2026-07-13

[github-actions]

Weekly merge of upstream/main hit conflicts in:

.github/workflows/ci.yml
agent/chat_completion_helpers.py
hermes_cli/config.py
tests/tools/test_vision_tools.py
tools/approval.py
tools/vision_tools.py
tools/web_tools.py

Resolve locally:

git fetch upstream main
git checkout -b upstream-sync-20260713 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

[juniperbevensee]

Resolved in #94 — the two stuck weekly-sync conflicts (this one and its sibling) are merged there, along with a couple of semantic-merge fixes git's text merge silently produced (the /deny <reason> handler landing in a shadowed mixin copy, and an observe-only path still using the raw sync session store). Closing once #94 lands.