Repository navigation
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this is
The single conflict pass the migration gate in #3581 asks for: the fork's tree
merged onto
NousResearch/hermes-agentv0.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
recorded in [UPSTREAM] Planned adoption of v0.23.x - gated migration (replaces the daily sync) #3581).
.github/**— ours, unchanged (fork CI is deliberately separate; keepingthe workflows identical to
mainalso keeps the push inside the token scope).(base → main) is re-applied on top. Hunks that still anchor land automatically;
the ones upstream's rewrite invalidated are inventoried instead of forced.
package-lock.json→pnpm-lock.yaml,uv.lockverified with
uv lock --check, nix pins, docs catalogs.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 inthe 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.main9baa9964(run 42725274617): 202 unique failing test ids.
Not done yet (the remaining work, in order)
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.command the baseline used.
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.