Resume/audit the interrupted Hermes fix session `20260601_220330_38ea10`.

  Context: the previous run tried to patch `minimax-m3-free` context length handling, then `hermes update`/stash-pop left unresolved conflict markers in
  `~/.hermes/hermes-agent/agent/model_metadata.py`, causing Hermes startup to crash with `SyntaxError` near `<<<<<<< Updated upstream`.

  Please inspect the current repo state before changing anything:
  - `git status --short`
  - search for real conflict markers: `rg -n "^(<<<<<<<|=======|>>>>>>>)" ~/.hermes/hermes-agent`
  - verify `agent/model_metadata.py` imports cleanly
  - verify `minimax-m3-free` resolves to `1000000`
  - run the relevant model metadata/context tests

  Expected final state:
  - keep upstream’s MiniMax-M3 stale-cache invalidation helper/fix
  - keep the fresh `models.dev` underreport guard so `minimax-m3-free` on `opencode-zen` does not resolve to 200K
  - do not discard local changes unless explicitly asked
  - summarize exactly what remains uncommitted and whether Hermes starts cleanly