[UPSTREAM-ESCALATION] Sync release v2026.7.30 — 3087 commits, 85 conflicts (16 in core runtime)

[Lexus2016]

Upstream Release Sync — Escalation Required

The daily upstream-sync check found a new published release but this merge needs owner judgement — it exceeds the autonomous-merge thresholds defined in the evolution-upstream-sync skill.

Release

• Tag: v2026.7.30 (GitHub release: Hermes Agent v0.19.1, published 2026-07-30)
• Previous synced: v2026.7.20 (PR [UPSTREAM] Sync upstream release v2026.7.20 (880 commits) — resolves #1201 #1247)
• Commits: 3,087 (10-day upstream interval — upstream is very active)

Why escalated (per skill thresholds)

Criterion	Threshold	Actual	Status
Conflicted files	≤ 10	85	⛔ escalate
Core runtime conflicts	0	16	⛔ escalate
run_agent.py conflict	no	yes	⛔ escalate
agent/** conflict	no	8 files	⛔ escalate
cron/scheduler.py conflict	no	yes	⛔ escalate
hermes_cli/** conflict	no	3 files	⛔ escalate

Conflict surface (85 files)

1. CI/CD workflows (9 files) — upstream-domain, trivially take theirs:
.github/workflows/ — ci, deploy-site, docker, lint, osv-scanner, skills-index, supply-chain-audit, upload_to_pypi, uv-lockfile-check

2. Tests (42 files) — mostly upstream-side; take upstream unless they test our features:
tests/agent/, tests/cron/, tests/tools/, tests/run_agent/, tests/gateway/, tests/hermes_cli/, tests/plugins/, tests/acp/

3. Core agent/runtime (8 files in agent/) — ⛔ judgement-heavy:
agent/chat_completion_helpers.py, agent/context_compressor.py, agent/conversation_loop.py (12 evolution keywords), agent/error_classifier.py, agent/prompt_builder.py, agent/system_prompt.py, agent/tool_executor.py, agent/tool_guardrails.py

4. Core persistence/scheduler (3 files) — ⛔ judgement-heavy:
cron/scheduler.py (37 evolution keywords), cron/jobs.py, cron/scheduler_provider.py

5. CLI/runtime entry (5 files) — ⛔ judgement-heavy:
run_agent.py (2 evolution keywords), hermes_state.py, hermes_cli/commands.py, hermes_cli/config.py (12 evolution keywords), hermes_cli/main.py (21 evolution keywords)

6. Tools (7 files):
tools/cronjob_tools.py, tools/delegate_tool.py, tools/file_tools.py, tools/fuzzy_match.py, tools/mcp_tool.py, tools/tool_search.py, tools/transcription_tools.py

7. Other (11 files):
cli.py, gateway/delivery.py, gateway/run.py, model_tools.py, plugins/web/ddgs/provider.py, pyproject.toml, scripts/release.py, scripts/run_tests_parallel.py, skills/autonomous-ai-agents/hermes-agent/SKILL.md, uv.lock, website/docs/user-guide/features/tool-search.md

Our evolution features at risk (authorship scan)

Core files contain our additive features that a blind wholesale merge could drop:

• telemetry (cron/scheduler.py: 37 hits, hermes_cli/main.py: 21 hits)
• dotenv-secrets (hermes_cli/config.py: 12 hits, agent/conversation_loop.py: 12 hits)
• reasoning-strip (agent/conversation_loop.py)
• flush_cache / evolution hooks (multiple files)

These need authorship-driven resolution: keep OURS for additive evolution code, take upstream for upstream-domain code, follow upstream reverts.

Recommended resolution plan (for owner)

1. Workflows (9): git checkout --theirs — upstream-domain
2. Tests (42): take upstream unless they assert our evolution behavior (telemetry, dotenv, flush)
3. Core runtime (16): authorship-driven per symbol/hunk — this is the 90% of the work
4. Tools (7): examine each — likely upstream changes with our additive hooks
5. Other (11): pyproject → theirs then uv lock; uv.lock → regenerate; docs → theirs
6. Run silent-drop detection (comm -23 symbol diff) after resolving
7. Verify: compileall + pytest tests/cron tests/run_agent tests/tools tests/hermes_cli
8. PR: [UPSTREAM] Sync upstream release v2026.7.30 (3087 commits)

State

• Merge was staged with git merge --no-ff --no-commit v2026.7.30, conflicts surveyed, then aborted cleanly.
• main is at aa74e8b4e, branch is clean.
• upstream remote configured; tags fetched.

To execute

git fetch upstream refs/tags/v2026.7.30:refs/tags/v2026.7.30
git checkout -b sync/upstream-release-v2026.7.30
git merge --no-ff v2026.7.30
# resolve 85 conflicts per the plan above

🤖 Generated by evolution-upstream-sync (PRIVATE mode, daily check 2026-07-31)