Skip to content

Sync upstream/main into ytheesh fork main - #9

Merged
ytheesh96 merged 4 commits into
mainfrom
sync/upstream-main-20260708-000005-551f00109de8
Jul 8, 2026
Merged

Sync upstream/main into ytheesh fork main#9
ytheesh96 merged 4 commits into
mainfrom
sync/upstream-main-20260708-000005-551f00109de8

Conversation

@ytheesh96

Copy link
Copy Markdown
Owner

Summary

  • Merge upstream/main 551f00109de824f147e0826260f649b3fdc3f9e7 into ytheesh96 fork main based on origin/main 409d738c39b480d9fa1fbe03e11731aae22c14a1.
  • Preserve fork-only Loop/Kanban/Desktop/gateway behavior; no conflicts were reported by git, so upstream's new dashboard topology, platform-native toolset, and sessions docs changes applied cleanly.

Local verification

  • git diff --name-only --diff-filter=U → no unresolved paths
  • conflict marker scan for <<<<<<< / >>>>>>> → total=0
  • scripts/run_tests.sh tests/hermes_cli/test_tools_config.py tests/hermes_cli/test_web_server_gateway_topology.py -q → 132 passed
  • scripts/run_tests.sh tests/hermes_cli/test_update_post_pull_syntax_guard.py tests/hermes_cli/test_web_server.py -q → 356 passed

Upstream commits

teknium1 and others added 4 commits July 7, 2026 16:13
…usResearch#60537)

/api/status (loopback/insecure binds only) now includes:
- profiles: every profile on the host (default + named)
- gateway_mode: none | single | multiple | multiplex
- gateways: one entry per live gateway with the host ports its
  port-binding platforms listen on, plus served_profiles when the
  default gateway is multiplexing

Ports resolve from each profile's config.yaml (top-level platforms:
wins over gateway.platforms:, matching load_gateway_config precedence)
with adapter defaults as fallback. Topology enumeration runs in an
executor so the profile scan + process-table probes stay off the event
loop, and the whole block is gated behind the same loopback-only split
as hermes_home/gateway_pid so gated binds leak nothing new.
…xplicitly configured (NousResearch#35527)

When a user explicitly configures a platform with its native composite
(e.g. platform_toolsets.discord: [hermes-discord]), the discord and
discord_admin toolsets were silently stripped by _DEFAULT_OFF_TOOLSETS
even though the composite contains those tools. The strip could not tell
an explicit composite opt-in apart from the unconfigured default.

Track whether the platform was explicitly configured and, when it was,
exempt toolsets that are both default-off and platform-restricted to the
current platform from the strip. Only discord/discord_admin are affected
(the sole entries in both _DEFAULT_OFF_TOOLSETS and
_TOOLSET_PLATFORM_RESTRICTIONS). Unconfigured and empty-list platforms
keep the security default-off behaviour.
…earch#60554)

Restructures the five parallel export sections into a single 'Export
Sessions' section: a format table (jsonl/md/qmd/html/trace + --only
user-prompts), one shared-filters paragraph covering all formats, and
per-format subsections nested beneath. EN + zh-Hans.
@ytheesh96
ytheesh96 merged commit fbc5a5c into main Jul 8, 2026
30 checks passed
@ytheesh96
ytheesh96 deleted the sync/upstream-main-20260708-000005-551f00109de8 branch July 8, 2026 00:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants