[waleedlatif1]

Summary

• One broken /-tagged MCP server no longer breaks integration discovery for the whole chat. Tagged servers are discovered with Promise.all and a server with no tools throws, and the catalog includes MCP on every unfiltered request. So a deleted, disabled, down or reconnect-needed server, or one with no tools, failed every integrations list --query and search call for every integration, for the rest of the chat (tagging is sticky).
• Each tagged server now settles on its own. Unfiltered and query results drop failed or empty servers and log them; a request that explicitly targets the server (mcp:<id> service, or one of its toolIds) still fails with that server's own error. Authorization is unchanged.
• Removes stale Go-era leftovers: the "tools ride the tool array" comment, the defer_loading/executeLocally/params fields nothing reads, and two builders only tests referenced.

Type of Change

• Bug fix

Testing

• catalog.test.ts now exercises the real mcp-tools module. With deleted, failing, zero-tool and healthy tagged servers, unfiltered and query requests return native operations plus the healthy server's (these failed before with MCP server not found). Targeting each bad server still fails with its own error.
• mcp-tools.test.ts: a failing or tool-less server is reported without discarding the others.
• 270/270 in the affected vitest files; CI runs the rest.

Checklist

• Code follows project style guidelines
• Self-reviewed my changes
• Tests added/updated and passing
• No new warnings introduced
• I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated
docs	Skipped		Oct 20, 2026 11:46pm UTC

[cubic-dev-ai]

All reported issues were addressed across 8 files

<sub>Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic</sub>

[greptile-apps]

Confidence Score: 5/5

[Medium impact] The PR appears safe to merge; no actionable issues were found.

Summary

Tagged MCP servers now fail independently, so one broken or empty server no longer removes healthy servers and native operations from broad discovery.

• Tagged MCP discovery keeps healthy results when another server fails.
• Unused MCP builders and their old test wiring are removed.

The PR description from waleedlatif1 explicitly keeps authorization unchanged.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Discover tagged servers] --> B[Settle each server separately]
  B --> C[Collect healthy tools]
  B --> D[Collect failed servers]
  D --> E{Request targets a failed server?}
  E -->|Yes| F[Throw that server's error]
  E -->|No| G[Log and omit failed servers]
  C --> H[Return matching operations]
  G --> H

Loading

_{Reviews (1) · Last reviewed commit: "fix(mothership): keep integration discov..." · Reviewed by Greptile}