emozilla
85c583dc34
Merge remote-tracking branch 'origin/main' into bb/gui
...
# Conflicts:
# apps/dashboard/package-lock.json
# apps/dashboard/package.json
# apps/dashboard/src/components/BottomPickSheet.tsx
# apps/dashboard/src/hooks/useBelowBreakpoint.ts
# gateway/platforms/telegram.py
# hermes_cli/gateway.py
# hermes_cli/web_server.py
# nix/web.nix
# scripts/install.ps1
# tests/gateway/test_telegram_thread_fallback.py
# tui_gateway/server.py
2026-05-20 01:35:02 -04:00
emozilla
e74f291dc2
Merge branch 'main' into bb/gui
2026-05-18 13:14:46 -04:00
Brooklyn Nicholson
02aaac8f73
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
...
# Conflicts:
# cli.py
# hermes_cli/main.py
# run_agent.py
# tests/hermes_cli/test_cmd_update.py
# tools/mcp_tool.py
# web/src/lib/gatewayClient.ts
2026-05-18 01:26:56 -05:00
Brooklyn Nicholson
c7e6a48bfb
feat: more ui qa
2026-05-16 21:26:50 -05:00
Brooklyn Nicholson
062eed654d
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
2026-05-16 11:36:22 -05:00
Brooklyn Nicholson
6640a9d3ab
Merge main into bb/gui.
...
Resolve merge conflicts while preserving bb/gui dashboard paths and STT provider support.
2026-05-15 15:33:28 -05:00
emozilla
747caa74f0
Merge branch 'main' into bb/gui
2026-05-12 21:18:07 -04:00
Brooklyn Nicholson
dc66a98430
Merge remote-tracking branch 'origin/main' into bb/gui
...
# Conflicts:
# apps/dashboard/src/i18n/af.ts
# apps/dashboard/src/i18n/de.ts
# apps/dashboard/src/i18n/es.ts
# apps/dashboard/src/i18n/fr.ts
# apps/dashboard/src/i18n/ga.ts
# apps/dashboard/src/i18n/hu.ts
# apps/dashboard/src/i18n/it.ts
# apps/dashboard/src/i18n/ja.ts
# apps/dashboard/src/i18n/ko.ts
# apps/dashboard/src/i18n/pt.ts
# apps/dashboard/src/i18n/ru.ts
# apps/dashboard/src/i18n/tr.ts
# apps/dashboard/src/i18n/uk.ts
# apps/dashboard/src/i18n/zh-hant.ts
# gateway/config.py
# hermes_cli/main.py
# plugins/strike-freedom-cockpit/README.md
# tui_gateway/server.py
2026-05-11 16:40:09 -04:00
Brooklyn Nicholson
9222f1c491
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
2026-05-09 09:57:46 -04:00
Brooklyn Nicholson
fc9d18b03f
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
...
# Conflicts:
# tui_gateway/server.py
2026-05-07 21:19:31 -04:00
Brooklyn Nicholson
81d4316b4a
Merge origin/main into bb/gui — resolve server + docs navbar conflicts
2026-05-06 14:07:38 -05:00
emozilla
2964f25534
fix(dashboard): resolve @nous-research/ui path under npm workspaces
...
The sync-assets prebuild step shelled out to 'cp -r
node_modules/@nous-research/ui/dist/fonts ...' with a path relative
to apps/dashboard/. That works only when the dep is installed
locally in the dashboard workspace, but 'npm install' at the repo
root (the documented setup — see apps/desktop/README.md) hoists
shared deps to the root node_modules under npm workspaces. The
relative cp then fails with 'No such file or directory', sync-assets
exits 1, the Vite build aborts, and 'hermes dashboard' surfaces a
generic 'Web UI build failed' message.
Replace the shell one-liner with scripts/sync-assets.cjs, which
walks up from the dashboard directory looking for node_modules/
@nous-research/ui — working in both the hoisted (workspaces) and
co-located (standalone) layouts. Also guards against a missing
dist/fonts or dist/assets with a clearer error pointing at a
rebuild of the UI package rather than silently copying nothing.
2026-05-05 02:10:35 -04:00
Brooklyn Nicholson
023730314b
docs: add desktop and dashboard run instructions
2026-05-04 23:39:27 -05:00
Brooklyn Nicholson
ca8f2c7907
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
2026-05-04 12:47:53 -05:00
Brooklyn Nicholson
a66303eaef
feat: move dashboard to apps/ so we can share ws proto
2026-05-02 13:38:49 -05:00
