- _hermes_api_post sends X-Hermes-Session-Id so each fork sync uses a
fresh gateway transcript (was: derived session reused 200k-token history
across upstream tips, making later runs pay growing context)
- SYNC_CLAUDE_TIMEOUT 2700→3600: a fresh session needs ~25min/120 calls
to resolve 17 files + verify + commit; 2700s cut the HTTP call while the
agent was still committing
- salvage-on-timeout: when the agent call ends early (timeout/transport)
but the merge is already committed (MERGE_HEAD gone), finish+push it
instead of aborting — verified live: 17 conflicts resolved by agent,
push ok, fork 27 ahead / 0 behind
- _sync_finish_merge blocks committing files that still carry conflict
markers (guard against git add of unresolved files)
- tests: 68/68 (session header, salvage completed merge, abort unfinished,
marker guard; fake-leak hardening in _install_git_fake)
Claude Code could not complete AI fixes / conflict resolution against this
host's provider setup: it hung 900s spawning an MCP server, then failed with
'body is JSON but not a Message' (Anthropic-Messages transport mismatch), then
exited 1 with empty stderr. The Hermes gateway already runs continuously with
the working 9router provider config and a full toolset, so drive it directly:
- POST http://127.0.0.1:8642/v1/chat/completions (OpenAI-compatible API server)
- bearer auth from API_SERVER_KEY (env or ~/.hermes/.env), overridable via
API_SERVER_URL
- model_options.max_turns caps a runaway run; 900s timeout for sync, 600s for
PR fixes
- every failure maps to an [INFRA] string so the existing skip-once logic works
- the agent commits locally; the WORKER pushes (agents must never push)
run_ai_fix no longer shells out to claude; it calls the API server, then pushes
the agent's commit itself and reports push failures explicitly. Sync call sites
keep their contract via _run_claude_sync -> _run_hermes_sync alias, with labels
renamed hermes_sync_conflicts / hermes_sync_quality.
Tests: 59/59 (8 new assertions exercise a real local HTTP round-trip: path,
bearer auth, OpenAI message shape, max_turns cap, HTTP-error/missing-key/
unreachable -> [INFRA]).
- --dry now touches nothing: no state file writes (run_upstream_sync uses a
throwaway state dict; sync_fork_repo refuses to mutate in dry), no Discord,
no push, no PR (protected-branch dry prints would-open instead). The earlier
dry run polluted /tmp/pr-queue-sync-state.json and posted a false 'skip'
notification — both are gone.
- Claude Code conflict/quality runs now use --strict-mcp-config (with
--mcp-config ''): --mcp-config '' alone still lets claude -p spawn MCP
servers from settings.json/managed/plugins (observed ouroboros mcp serve
hanging 15+ min with zero output until the 900s timeout). These calls only
read/edit a throwaway clone and run git — no MCP server is ever needed.
- tests: 51/51 (added dry-purity cases: clean-merge, conflict-failure).
Merge new upstream (parent) commits into every fork in the App installation,
gated by a per-repo interval (default 1h), inside the existing 5-minute tick
(STEP 0, max 2 forks/tick, oldest-first).
- Conflicted merges are resolved by Claude Code (merge-reconciler rules:
never wholesale --ours/--theirs, verify with the repo's own
typecheck+tests, commit --no-edit; Claude never pushes — harness does).
- Clean merges get a single Claude Code quality pass commit.
- Push path: owner PAT (gh CLI) first — the App lacks workflows:write and a
workflows-touching merge is rejected for the App token; App token fallback.
- Protected default branch: detected from the push result (GH006 /
required-status-check) → upstream-sync-<ts> branch + PR through the normal
pipeline; duplicate open sync PRs are skipped.
- CI safety: after a direct push, ticks verify the fork CI at our merge sha;
red CI at OUR merge (still the tip) → sha-guarded force-revert to
pre-merge sha + Discord notify; never reverts foreign commits.
- Discord: synced / PR opened / reverted / skipped-once on pr-agent-ops.
- merge_pr gains the same PAT fallback (a PR merge touching workflows is a
workflow-file push).
- CLI: --sync-status, --sync-only <repo> [--dry].
- Tests: scripts/test_pr_queue_sync.py (46 assertions, monkeypatched, no
network); py_compile clean.
- Plan: .hermes/plans/2026-09-21-upstream-auto-sync.md
asepharyana