mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-21 16:18:55 +00:00
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 | ||
| dashboard_auth | ||
| image_gen | ||
| memory | ||
| model_providers | ||
| platforms/photon | ||
| transcription | ||
| tts | ||
| video_gen | ||
| web | ||
| __init__.py | ||
| test_achievements_plugin.py | ||
| test_chronos_cron.py | ||
| test_chronos_verify.py | ||
| test_discord_runtime_failure.py | ||
| test_disk_cleanup_plugin.py | ||
| test_google_meet_audio.py | ||
| test_google_meet_node.py | ||
| test_google_meet_plugin.py | ||
| test_google_meet_realtime.py | ||
| test_hindsight_health_grace_timeout.py | ||
| test_hindsight_root_guard.py | ||
| test_kanban_attachments.py | ||
| test_kanban_dashboard_plugin.py | ||
| test_kanban_worker_runs.py | ||
| test_langfuse_plugin.py | ||
| test_nemo_relay_plugin.py | ||
| test_plugin_dashboard_auth_contract.py | ||
| test_raft_check_fn_silent.py | ||
| test_retaindb_plugin.py | ||
| test_security_guidance_plugin.py | ||
| test_teams_pipeline_plugin.py | ||