Real delta (verified 2026-06-26, full clone after unshallowing)

git fetch upstream --prune then:

• Behind upstream/main: 391 commits
• Ahead: 295 commits
• Merge-base: 6cc07b6cd0 — 2026-06-23 10:44:02 -0700 ("feat(discord): render reasoning as -# subtext ... (#51168)"), i.e. divergence is ~3 days deep but heavy.

391 > escalate_if_commits_over: 80 (cron/evolution/upstream-sync.yaml) → auto-merge is blocked by design. This needs an owner-reviewed sync PR; do NOT blind-resolve.

Safe conflict preview (no side effects)

On a throwaway branch off origin/main, git merge --no-commit --no-ff upstream/main then --abort + branch deleted. Result:

• Total conflicted files: 13 ( > escalate_if_conflicts_over: 10 )
• CORE-PATH conflicts (each independently forces escalation per the skill rule):
  • agent/conversation_loop.py
  • agent/retry_utils.py
  • agent/transports/codex.py
  • cron/scheduler.py
  • hermes_cli/config.py
• Other conflicts: scripts/release.py, tools/mcp_tool.py, tools/terminal_tool.py, plus tests: tests/agent/test_auxiliary_client.py, tests/cron/test_scheduler.py, tests/test_tui_gateway_server.py, tests/tools/test_cronjob_tools.py, tests/tools/test_terminal_tool.py.

Preview merge was aborted, temp branch _preview_upstream_2026_06_26 deleted, working tree clean — no state left behind.

Why the daily job did not handle this

• The designed daily job (evolution-upstream-sync, cron 0 8 * * *, job 4d18a3bf21bc) ran today and escalated — but on STALE/shallow data: its 2026-06-26 report shows "Behind upstream: 13,001 commits" (phantom count from a pre-unshallow shallow clone; cf. open PR fix(watchdog): suppress phantom upstream-lag alarm on shallow clones (client-wide) #561 fixing the watchdog shallow-lag alarm). The 2026-06-27 report was fully blocked ("no repository found / no shell tool").
• In both cases the skill produced only a LOCAL markdown report under ~/.hermes/profiles/user1/evolution/upstream/ and did not open a GitHub PR/issue. This issue is the tracked owner-review artifact with the now-correct 391/295 numbers.

Recommended owner action

1. Review the 391-commit backlog and decide merge strategy (incremental chunks vs one large sync PR).
2. Cut a sync/upstream-2026-06-26 branch off origin/main, merge upstream/main, resolve the 5 core-path conflicts with authorship-driven judgement (NOT auto), get green CI + owner review, then PR into main.
3. NOTE: a parked stash (stash@{0} osoba-runtime-pre-reconcile-2026-06-26, 10 files) is dirtying main-adjacent runtime; decide keep/PR/discard before the sync so the merge starts clean.

Auto-merge intentionally NOT performed. No merge/push to main was done. Counts and conflict preview verified read-only on osoba.