Skip to content

feat(web): move ask and mcp to ee#1247

Merged
msukkari merged 44 commits into
v5from
v5-ee
May 30, 2026
Merged

feat(web): move ask and mcp to ee#1247
msukkari merged 44 commits into
v5from
v5-ee

Conversation

@msukkari
Copy link
Copy Markdown
Contributor

Fixes SOU-1199
Fixes SOU-1200

jsourcebot added 30 commits May 28, 2026 17:37
Rework the MCP servers page with a cleaner, more compact layout:
- Split servers into Connected / Suggested sections
- Add search bar with All / Connected filter tabs
- Compact card design with smaller favicons, stripped URLs, quieter status indicators
- Move Reconnect into three-dot overflow menu alongside new Disconnect option
- Add disconnectMcpServer server action to remove a user's MCP credentials
- Extract useConnectMcp hook for shared connect/reconnect logic
Redesign the workspace Ask Agent page with card-based layout, 3-stat
strip, connector rows with status indicators, kebab menu, and Connect
button with OAuth flow. Extract shared ConnectorRowInfo component for
reuse between workspace and account settings pages.
Add "Configure connectors" link to the chat toolbar's Connectors
submenu, pointing to /settings/workspaceAskAgent for workspace-level
connector management. Keep existing "Manage connectors" link to
/settings/accountAskAgent for personal connector setup.
Replace the full-card tool list with a compact badge grid. Clicking a
badge reveals that tool's detail panel inline; only one detail is visible
at a time. Also remove the focus ring from the tools trigger button.
Unify the duplicated card layout between AccountConnectedConnectorCard
and WorkspaceConnectorCard into a single ConnectorCard component that
owns the Collapsible state, Card shell, ConnectorRowInfo, and tool
disclosure wiring. The divergent parts (status badge, action buttons)
are passed as ReactNode slots.
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 30, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 7df0045b-f718-4570-bf41-4361b58908e9

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch v5-ee

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

msukkari and others added 5 commits May 29, 2026 18:18
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
# Conflicts:
#	docs/docs/features/mcp-server.mdx
#	docs/docs/misc/service-ping.mdx
#	packages/web/src/app/(app)/settings/accountAskAgent/page.tsx
#	packages/web/src/app/(app)/settings/layout.tsx
#	packages/web/src/app/(app)/settings/license/types.ts
#	packages/web/src/app/(app)/settings/workspaceAskAgent/page.test.tsx
#	packages/web/src/app/(app)/settings/workspaceAskAgent/page.tsx
#	packages/web/src/app/(app)/settings/workspaceAskAgent/workspaceAskAgentPage.tsx
#	packages/web/src/app/api/(client)/client.ts
#	packages/web/src/app/api/(server)/ee/askmcp/callback/route.test.ts
#	packages/web/src/app/api/(server)/ee/askmcp/callback/route.ts
#	packages/web/src/app/api/(server)/ee/askmcp/configuration/route.test.ts
#	packages/web/src/app/api/(server)/ee/askmcp/configuration/route.ts
#	packages/web/src/app/api/(server)/ee/askmcp/connect/route.test.ts
#	packages/web/src/app/api/(server)/ee/askmcp/connect/route.ts
#	packages/web/src/app/api/(server)/ee/askmcp/servers/route.test.ts
#	packages/web/src/app/api/(server)/ee/askmcp/servers/route.ts
#	packages/web/src/app/api/(server)/ee/askmcp/tools/route.test.ts
#	packages/web/src/app/api/(server)/ee/askmcp/tools/route.ts
#	packages/web/src/app/api/(server)/ee/chat/route.ts
#	packages/web/src/ee/features/chat/agent.ts
#	packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx
#	packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx
#	packages/web/src/ee/features/chat/components/chatThread/detailsCard.test.tsx
#	packages/web/src/ee/features/chat/components/chatThread/mcpFailedServersBanner.tsx
#	packages/web/src/ee/features/chat/components/chatThread/toolApprovalBanner.tsx
#	packages/web/src/ee/features/chat/components/chatThread/tools/jsonHighlighter.tsx
#	packages/web/src/ee/features/chat/components/chatThread/tools/mcpToolComponent.tsx
#	packages/web/src/ee/features/chat/components/chatThread/tools/toolSearchToolComponent.tsx
#	packages/web/src/ee/features/chat/components/chatThreadPanel.test.tsx
#	packages/web/src/ee/features/chat/components/chatThreadPanel.tsx
#	packages/web/src/ee/features/chat/mcp/actions.test.ts
#	packages/web/src/ee/features/chat/mcp/actions.ts
#	packages/web/src/ee/features/chat/mcp/components/connectorCard.tsx
#	packages/web/src/ee/features/chat/mcp/components/connectorToolDisclosure.test.tsx
#	packages/web/src/ee/features/chat/mcp/components/connectorToolDisclosure.tsx
#	packages/web/src/ee/features/chat/mcp/components/connectorToolUsageDisclosure.tsx
#	packages/web/src/ee/features/chat/mcp/hooks/useMcpToolMetadata.ts
#	packages/web/src/ee/features/chat/mcp/mcpClientFactory.test.ts
#	packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
#	packages/web/src/ee/features/chat/mcp/mcpToolSets.ts
#	packages/web/src/ee/features/chat/mcp/types.ts
#	packages/web/src/features/billing/planComparisonTable.tsx
#	packages/web/src/features/chat/components/chatBox/chatBoxPlusButton.tsx
#	packages/web/src/features/chat/mcpOAuthDraft.test.ts
#	packages/web/src/features/chat/mcpOAuthDraft.ts
#	packages/web/src/middleware/withAuth.test.ts
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@msukkari msukkari changed the title feat(web): gate MCP server behind paid subscription feat(web): move ask and mcp to ee May 30, 2026
Move prismaOAuthClientProvider and mcpOAuthReturnTo (Ask-connector OAuth-client code) from ee/features/mcp (the MCP-server folder) into ee/features/chat/mcp, alongside the rest of the Ask connector code, so 'Sourcebot as an MCP server' and 'Ask connecting to external MCP servers' are cleanly separated at the folder level. Repoint importers (askmcp connect/callback routes, mcpClientFactory). No behavior change; all paths remain gated on the `ask` entitlement.

Also remove two stale duplicate test files left behind by the EE migration (their sources moved to ee/): features/chat/agent.test.ts and features/chat/components/chatBox/chatBoxPlusButton.test.ts.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@msukkari msukkari merged commit fafeb02 into v5 May 30, 2026
3 checks passed
@msukkari msukkari deleted the v5-ee branch May 30, 2026 01:57
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