Skip to content

Aeon: promote canary 8333f6c13 to prod - #72

Merged
ashneil12 merged 3 commits into
mainfrom
aeon/promote-20260622-2212
Jun 22, 2026
Merged

ashneil12 merged 3 commits into
mainfrom
aeon/promote-20260622-2212

Conversation

@ashneil12

Copy link
Copy Markdown
Owner

3h-soaked promotion of the canary-validated upstream sync to prod (soaked ~14h; well over the 3h trail).

Promotes the soaked canary mark 8333f6c13 (NOT the time-window auto-pick de7ad8b78, which is an unsoaked upstream commit pulled in by canary sync NousResearch#142 minutes ago). 8333f6c13 is the canary-validated state ~2 commits ahead of prod main.

Brings in 2 commits:

Clean 3-way merge, zero conflicts. Merge commit preserves the merge-base (no squash). Attribution gate passes (sole author is a +noreply that auto-resolves; no AUTHOR_MAP edit needed).

Merges on green CI; builds the prod :stable image. Does NOT roll prod fleet VMs (rolls stay manual).

ashneil12 and others added 3 commits June 22, 2026 08:32
…turns get MCP tools (NousResearch#140)

The dashboard webchat (`hermes dashboard`) runs each turn in a per-session
tui_gateway.slash_worker subprocess that builds a HermesCLI and calls
process_command. That path assembles the turn's tool list via
cli.get_tool_definitions() -> wait_for_mcp_discovery(), but nothing in the
slash-worker path ever STARTS discovery — the eager TUI/api_server startup that
normally kicks it off is bypassed, and the deferred fallback is gated on
HERMES_DEFER_AGENT_STARTUP (unset). Result: every webchat turn was served with
ZERO MCP tools, so connected Pipedream apps (google_calendar, gmail, github, ...)
were invisible to the agent even when the box had them configured and the
gateway/api_server agent had them registered.

Start discovery right after the CLI build and block until it completes before
accepting the first command, so the first turn already has the MCP tools in its
selection (a bare start would race the 0.75s wait inside the turn and lose).

Verified on a canary box: get_tool_definitions() now returns 232 tools incl. all
17 google_calendar_* tools (was 0 MCP tools before the fix).

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
… image builds (NousResearch#141)

An upstream sync re-introduced a blanket `apps/` entry in .dockerignore (comment:
"Desktop app source; never installed in the container"). That's true for the FINAL
image, but the fork's `webchat_build` Dockerfile stage compiles apps/desktop (which
imports apps/shared) into the /webchat bundle via `COPY . . && cd apps/desktop &&
vite build`. With apps/ ignored, apps/desktop never lands in the build context and
`cd apps/desktop` fails with `can't cd to apps/desktop` (exit 2) — breaking the
entire `docker-publish` image build (failing since ~2026-06-21).

Switch the blanket ignore to `apps/*` + `!apps/desktop` + `!apps/shared` so the two
dirs the webchat build needs stay in context while the rest of apps/ (e.g. the
bootstrap-installer) is still excluded. Verified locally: `docker build --target
webchat_build` now compiles the webchat bundle cleanly (vite "✓ built").

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
@github-actions

Copy link
Copy Markdown

🔎 Lint report: aeon/promote-20260622-2212 vs origin/main

ruff

Total: 0 on HEAD, 0 on base (➖ 0)

🆕 New issues: none

✅ Fixed issues: none

Unchanged: 0 pre-existing issues carried over.

ty (type checker)

Total: 11337 on HEAD, 11339 on base (✅ -2)

🆕 New issues (1):

Rule Count
invalid-assignment 1
First entries
tests/run_agent/test_credits_notices_toggle.py:76: [invalid-assignment] invalid-assignment: Object of type `None` is not assignable to attribute `_credits_session_start_micros` of type `int`

✅ Fixed issues (2):

Rule Count
unresolved-attribute 2
First entries
tests/run_agent/test_credits_notices_toggle.py:76: [unresolved-attribute] unresolved-attribute: Unresolved attribute `_credits_session_start_micros` on type `AIAgent`
run_agent.py:2985: [unresolved-attribute] unresolved-attribute: Object of type `Self@get_credits_spent_micros` has no attribute `_credits_session_start_micros`

Unchanged: 5953 pre-existing issues carried over.

Diagnostics are surfaced as warnings — this check never fails the build.

@ashneil12
ashneil12 merged commit 5f667b1 into main Jun 22, 2026
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant