Skip to content

Adopt upstream v0.23.1: one conflict pass (gated migration for #3581) - #3582

Draft
Lexus2016 wants to merge 10000 commits into
mainfrom
sync/upstream-v0.23.1
Draft

Lexus2016 wants to merge 10000 commits into
mainfrom
sync/upstream-v0.23.1

Conversation

@Lexus2016

Copy link
Copy Markdown
Owner

What this is

The single conflict pass the migration gate in #3581 asks for: the fork's tree
merged onto NousResearch/hermes-agent v0.23.1 (10,774 upstream commits,
merge base d923a5eb = release 0.22.2).

Draft on purpose: the merge is committed and importable, but the fork's own
hunks that no longer anchor are not ported yet, so the parity gate has not been
measured on a finished port.

How the conflicts were resolved

  • 116 conflicted paths / 218 hunks at the start (matches the measurement
    recorded in [UPSTREAM] Planned adoption of v0.23.x - gated migration (replaces the daily sync) #3581).
  • .github/** — ours, unchanged (fork CI is deliberately separate; keeping
    the workflows identical to main also keeps the push inside the token scope).
  • Every other file starts from upstream's v0.23.1 version and the fork's diff
    (base → main) is re-applied on top. Hunks that still anchor land automatically;
    the ones upstream's rewrite invalidated are inventoried instead of forced.
  • Tooling follows upstream: package-lock.json → pnpm-lock.yaml, uv.lock
    verified with uv lock --check, nix pins, docs catalogs.
  • Fork code kept where it still anchors: preflight guard ([FIX] Terminal tool preflight guard to reduce failure rate #3243), skill-contract
    edit gate, MCP durability wrapper, colliding-skill namespaces ([evolution] Skill slash-command collisions reduce discoverability #3096),
    provenance round-trip (origin), execute-tool events, durable-write fence in
    the background review fork, write-guard policy plumbing, bot-detection
    failure suffix, SQL errno/socket tables.

Measured state

  • import agent.agent_init, tools.terminal_tool, cron.scheduler, run_agent, hermes_cli.main, model_tools, gateway.run_turn, ... — all import.
  • No conflict markers in the tree; no unmerged paths.
  • Baseline for the parity gate is measured from CI on main 9baa9964
    (run 42725274617): 202 unique failing test ids.

Not done yet (the remaining work, in order)

  1. Port the backlog hunks: 72 files / 219 hunks whose upstream anchor changed —
    the biggest are agent/tool_guardrails.py, tools/memory_tool_store.py,
    cron/scheduler.py, tools/delegate_tool.py, tools/file_tools.py,
    tools/tool_search.py, agent/memory_manager.py.
  2. Re-run the suite and compare against the 202-id baseline with the same CI
    command the baseline used.
  3. Verify the pinned surfaces still seed on both install paths and that the
    installer E2E passes ([IMPROVEMENT] Replay-verified self-edits, slice 2: invariant core outside the agent-writable tree (child of #3515) #3518 surfaces).

Refs #3581. Do not merge before the four gates in that issue are green.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.