Merge remote-tracking branch 'origin/v5' into v5-ee

# 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

Author: msukkari

docs/docs/misc/service-ping.mdx

@@ -1,13 +1,13 @@
 ---
 title: "Service Ping"
-api: "GET https://license.sourcebot.dev/schema"
+api: "GET https://deployments.sourcebot.dev/schema"
 ---
 
 <Note>
   No sensitive data (source code, AI inputs/outputs, credentials, user information, etc) is ever transmitted.
 </Note>
 
-By default, all Sourcebot deployments will send a Service Ping, which is an HTTPS encrypted ping to `https://license.sourcebot.dev/ping` at port 443, every 24 hours. 
+By default, all Sourcebot deployments will send a Service Ping, which is an HTTPS encrypted ping to `https://deployments.sourcebot.dev/ping` at port 443, every 24 hours. 
 
 The data contained within the Service Ping is limited to:
 
@@ -26,7 +26,7 @@ The data contained within the Service Ping is limited to:
 | `activationCode` | `string` | Activation code, if your instance has one bound. |
 
 
-You can fetch the schema for the Service Ping by submitting a GET request to `https://license.sourcebot.dev/schema`
+You can fetch the schema for the Service Ping by submitting a GET request to `https://deployments.sourcebot.dev/schema`
 
 
 ```json wrap icon="wifi" Example Service Ping

packages/db/prisma/migrations/20260529214711_add_mcp_connectors_tables/migration.sql

@@ -0,0 +1,66 @@
+-- CreateEnum
+CREATE TYPE "McpServerClientInfoSource" AS ENUM ('DYNAMIC', 'STATIC');
+
+-- CreateTable
+CREATE TABLE "McpServer" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "sanitizedName" TEXT NOT NULL,
+    "serverUrl" TEXT NOT NULL,
+    "clientInfo" TEXT,
+    "clientInfoSource" "McpServerClientInfoSource" NOT NULL DEFAULT 'DYNAMIC',
+    "orgId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "McpServer_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "McpServerToolCallCount" (
+    "mcpServerId" TEXT NOT NULL,
+    "toolName" TEXT NOT NULL,
+    "count" INTEGER NOT NULL DEFAULT 0,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "McpServerToolCallCount_pkey" PRIMARY KEY ("mcpServerId","toolName")
+);
+
+-- CreateTable
+CREATE TABLE "UserMcpServer" (
+    "userId" TEXT NOT NULL,
+    "serverId" TEXT NOT NULL,
+    "tokens" TEXT,
+    "tokensExpiresAt" TIMESTAMP(3),
+    "codeVerifier" TEXT,
+    "state" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "UserMcpServer_pkey" PRIMARY KEY ("userId","serverId")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "McpServer_serverUrl_orgId_key" ON "McpServer"("serverUrl", "orgId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "McpServer_orgId_sanitizedName_key" ON "McpServer"("orgId", "sanitizedName");
+
+-- CreateIndex
+CREATE INDEX "UserMcpServer_serverId_idx" ON "UserMcpServer"("serverId");
+
+-- CreateIndex
+CREATE INDEX "UserMcpServer_state_idx" ON "UserMcpServer"("state");
+
+-- AddForeignKey
+ALTER TABLE "McpServer" ADD CONSTRAINT "McpServer_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "McpServerToolCallCount" ADD CONSTRAINT "McpServerToolCallCount_mcpServerId_fkey" FOREIGN KEY ("mcpServerId") REFERENCES "McpServer"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserMcpServer" ADD CONSTRAINT "UserMcpServer_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserMcpServer" ADD CONSTRAINT "UserMcpServer_serverId_fkey" FOREIGN KEY ("serverId") REFERENCES "McpServer"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/shared/src/env.server.ts

@@ -317,7 +317,7 @@ const options = {
 
         SOURCEBOT_ENCRYPTION_KEY: z.string(),
         SOURCEBOT_INSTALL_ID: z.string().default("unknown"),
-        SOURCEBOT_LIGHTHOUSE_URL: z.string().url().default("https://license.sourcebot.dev"),
+        SOURCEBOT_LIGHTHOUSE_URL: z.string().url().default("https://deployments.sourcebot.dev"),
 
         FALLBACK_GITHUB_CLOUD_TOKEN: z.string().optional(),
         FALLBACK_GITLAB_CLOUD_TOKEN: z.string().optional(),

packages/web/src/app/(app)/settings/accountAskAgent/accountAskAgentPage.test.tsx

@@ -0,0 +1,50 @@
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { cleanup, render, screen } from '@testing-library/react';
+
+vi.mock('@/app/api/(client)/client', () => ({
+    getMcpServersWithStatus: vi.fn(),
+    getMcpServerTools: vi.fn(),
+}));
+vi.mock('@/ee/features/chat/mcp/actions', () => ({
+    disconnectMcpServer: vi.fn(),
+}));
+
+const { AccountAskAgentEmptyState, AccountAskAgentOAuthUnavailableState } = await import('./accountAskAgentPage');
+
+afterEach(() => {
+    cleanup();
+});
+
+describe('AccountAskAgentEmptyState', () => {
+    test('points owners to workspace Ask Agent settings', () => {
+        render(<AccountAskAgentEmptyState canManageConnectors={true} />);
+
+        expect(screen.getByText('No connectors configured yet')).toBeTruthy();
+        expect(screen.getByText('Open Workspace Ask Agent to approve connectors for your workspace.')).toBeTruthy();
+        expect(screen.getByRole('link', { name: /Open Workspace Ask Agent/ }).getAttribute('href')).toBe('/settings/workspaceAskAgent');
+    });
+
+    test('tells members to contact an admin', () => {
+        render(<AccountAskAgentEmptyState canManageConnectors={false} />);
+
+        expect(screen.getByText('No connectors available')).toBeTruthy();
+        expect(screen.getByText(/Contact your workspace admin/)).toBeTruthy();
+        expect(screen.queryByRole('link', { name: /Open Workspace Ask Agent/ })).toBeNull();
+    });
+});
+
+describe('AccountAskAgentOAuthUnavailableState', () => {
+    test('points owners to workspace cleanup settings', () => {
+        render(<AccountAskAgentOAuthUnavailableState canManageConnectors={true} />);
+
+        expect(screen.getByText('Connector OAuth is unavailable')).toBeTruthy();
+        expect(screen.getByRole('link', { name: /Open Workspace Ask Agent/ }).getAttribute('href')).toBe('/settings/workspaceAskAgent');
+    });
+
+    test('hides workspace cleanup link from members', () => {
+        render(<AccountAskAgentOAuthUnavailableState canManageConnectors={false} />);
+
+        expect(screen.getByText('Connector setup is unavailable on this Sourcebot instance.')).toBeTruthy();
+        expect(screen.queryByRole('link', { name: /Open Workspace Ask Agent/ })).toBeNull();
+    });
+});