mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-21 16:18:55 +00:00
155a792013
Conflict resolutions: - web_server.py: keep the branch's unified provider-config handlers (declared schema served by default, profile-scoped) over main's surface=declared query param. Main's declared-surface helpers and the hermes_cli.memory_providers import are dropped — the branch deleted that module when provider schemas moved into their plugins, so main's code path could no longer import. - hermes.ts: keep profileScoped() calls without ?surface=declared to match the unified backend. - constants.ts: take main's new reasoning effort values (max, ultra), keep the branch's memory provider ordering. - config-settings.tsx: take main's FallbackModelsField import, drop the now-unused SECTIONS import (branch replaced it with sectionFieldEntries). - provider-config-panel.test.tsx: file moved to settings/memory/ on the branch; main's act() fixes targeted the old tests, and the rewritten suite produces no act() warnings, so the old path stays deleted. - test_web_server.py: keep both sides' new tests (main's MoA endpoint tests plus the branch's Honcho provider tests). |
||
|---|---|---|
| .. | ||
| browser | ||
| context_engine | ||
| cron_providers | ||
| dashboard_auth | ||
| disk-cleanup | ||
| google_meet | ||
| hermes-achievements | ||
| image_gen | ||
| kanban | ||
| memory | ||
| model-providers | ||
| observability | ||
| platforms | ||
| security-guidance | ||
| spotify | ||
| teams_pipeline | ||
| video_gen | ||
| web | ||
| __init__.py | ||
| plugin_utils.py | ||