merge: resolve conflicts with origin/main

Browse source

- gateway/run.py: Take main's _resolve_gateway_model() helper
- hermes_cli/setup.py: Re-apply nous-api removal after merge brought
  it back. Fix provider_idx offset (Custom is now index 3, not 4).
- tests/hermes_cli/test_setup.py: Fix custom setup test index (3→4)

...

This commit is contained in:

teknium1 2026-03-12 00:29:04 -07:00

parent 7febdf7208 8fa96debc9

commit 2192b17670

19 changed files with 1708 additions and 368 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

928

hermes_cli/setup.py

View file

File diff suppressed because it is too large Load diff