[waleedlatif1]

Summary

• Agent and plan chats now discover every usable workspace MCP server, not just the ones a user /-tagged. This matches Claude Code, Codex, Cursor and OpenCode, where configured MCP servers are available and their tools load on demand. Built-in integrations already work this way here.
• A tagged server now acts as a priority hint, not a gate. Its operations win ranking ties, and its own errors still surface. Execution never checked tags (traced through executeMcpToolUseCase, which authorizes per server), so the catalog lookup was the only gate.
• Latency: untagged servers are discovered through McpService's cache-aside path (5-minute cache, list_changed invalidation, deduplicated in-flight requests, a cooldown for failed servers), and each is capped at 3s. A cold or slow server is skipped and logged without failing the query, and the background discovery warms the cache for the next one. Tagged servers and exact-toolId lookups stay live and complete, as before.
• Unchanged scope: Search (assistant mode) stays MCP-free. Workflow-block requests (mcpExecution / mcpToolIds) stay limited to the block's selections and Force. Credential Group servers still need an explicit managed connection.
• Permission groups: if MCP is disabled for the requester, a broad query returns built-in operations without MCP instead of failing. A request that targets an MCP server still fails with the permission error.

Stacked on #9260 (resilient per-server discovery). Merge that first; this PR then retargets staging.

Type of Change

• New feature

Testing

• New catalog.test.ts block "untagged workspace MCP servers":
  • agent and plan queries return an untagged server's operations from the cache path;
  • disabled, Credential Group and deleted servers are excluded;
  • a tagged server ranks ahead of an equally relevant untagged one;
  • a slow untagged server is skipped after 3s without failing the query;
  • an MCP-disabled permission group still lists built-ins, while a targeted request throws;
  • an untagged server's exact toolId resolves via complete discovery.
• The 8 new tests fail on the previous code. The 5 touched vitest files pass (147 tests), and tsc --noEmit is clean. 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 21, 2026 1:17am UTC

[cubic-dev-ai]

No issues found across 10 files

Confidence score: 5/5

• Automated review surfaced no issues in the provided summaries.
• No files require special attention.

_{Turn on auto-fix | Re-trigger cubic}

[greptile-apps]

Confidence Score: 5/5

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

Summary

Agent and plan chats can discover usable workspace MCP servers without tagging them.

• Agent and Plan chats find workspace MCP tools without a tag.

No actionable issues were found. This review used code inspection; no tests were run.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Catalog request] --> B{Search mode?}
  B -->|Yes| C[Built-ins only]
  B -->|No| D{MCP allowed?}
  D -->|No, broad chat| C
  D -->|No, targeted or workflow| E[Permission error]
  D -->|Yes| F{Workflow selection?}
  F -->|Yes| G[Discover selected MCP tools]
  F -->|No| H[List usable workspace servers]
  H --> I[Tagged or targeted: complete discovery]
  H --> J[Untagged: cached discovery, three-second wait]
  G --> K[Filter and rank results]
  I --> K
  J --> K

Loading

_{Reviews (1) · Last reviewed commit: "feat(mothership): discover every workspa..." · Reviewed by Greptile}