merge: upgrade to upstream v0.50.95 + keep custom additions
Upstream v0.50.95 features merged (Russian localization, slash commands, mic toggle fix, gateway sync fix, KaTeX/Prism.js, etc.) Custom additions preserved: - Tier-2 agent switching commands in commands.js - MC panel in index.html + MC CSS - _resolve_cli_toolsets() in config.py - Custom routes.py, server.py, boot.js, i18n.js, messages.js, workspace.js Files with conflict resolution (took upstream, custom code in other files): - CHANGELOG.md, config.py, commands.js, index.html, panels.js, style.css, ui.js
This commit is contained in:
19
server.py
19
server.py
@@ -86,6 +86,25 @@ class Handler(BaseHTTPRequestHandler):
|
||||
|
||||
|
||||
def main() -> None:
|
||||
# Load ~/.hermes/.env into os.environ so API keys are available
|
||||
# (mirrors what run_agent.py does via load_hermes_dotenv).
|
||||
from pathlib import Path as _P
|
||||
import os as _os
|
||||
_env_file = _P(_os.environ.get('HERMES_HOME', str(_P.home() / '.hermes'))) / '.env'
|
||||
if _env_file.exists():
|
||||
try:
|
||||
with open(_env_file) as _f:
|
||||
for _line in _f:
|
||||
_line = _line.strip()
|
||||
if _line and not _line.startswith('#') and '=' in _line:
|
||||
_k, _v = _line.split('=', 1)
|
||||
_k = _k.strip()
|
||||
_v = _v.strip().strip('"').strip("'")
|
||||
if _k and _k not in _os.environ:
|
||||
_os.environ[_k] = _v
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
from api.config import print_startup_config, verify_hermes_imports, _HERMES_FOUND
|
||||
|
||||
print_startup_config()
|
||||
|
||||
Reference in New Issue
Block a user