Skip to content

⚡ Bolt: Batch OAuth token fetching for MCP servers to prevent N+1 queries#116

Open
Donach wants to merge 1 commit into
cfx/android-hermes-clientfrom
bolt/batch-mcp-oauth-tokens-7368254746094219191
Open

⚡ Bolt: Batch OAuth token fetching for MCP servers to prevent N+1 queries#116
Donach wants to merge 1 commit into
cfx/android-hermes-clientfrom
bolt/batch-mcp-oauth-tokens-7368254746094219191

Conversation

@Donach

@Donach Donach commented Jul 2, 2026

Copy link
Copy Markdown

💡 What: The injectPerUserOAuthTokens hook was refactored to first extract all needed server IDs, run a single batched repository query (getTokensForServers) to fetch both shared and per-user tokens, store them in a Map, and then synchronously resolve each server's token in-memory during the Promise.all loop.
🎯 Why: Iterating over Feathers list responses and fetching dependencies sequentially causes severe latency (N+1 database lookups).
📊 Impact: Reduces database queries from O(N) to O(1) for any endpoint serving multiple MCP servers.
🔬 Measurement: Verify by executing a fetch on multiple MCP servers and checking database query logs. Tests (pnpm --filter @agor/daemon run test) demonstrate no functionality regressions.


PR created automatically by Jules for task 7368254746094219191 started by @Donach

…ries

When fetching a list of MCP servers (like in the `/api/mcp-servers` hook),
the daemon looped over each server with `Promise.all` and executed an
individual query to `user_mcp_oauth_tokens` to fetch and inject the
appropriate OAuth token. This caused an N+1 query issue.

This commit introduces a batched repository method `getTokensForServers`
and refactors the injection hook to pre-fetch all needed tokens in a
single query, mapping them by `<user_id>:<server_id>`.

Co-authored-by: Donach <39565367+Donach@users.noreply.github.com>
@google-labs-jules

Copy link
Copy Markdown

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

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.

1 participant