Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { hasEntitlement } from "@/lib/entitlements";
import { authenticatedPage } from "@/middleware/authenticatedPage";
import { OrgRole } from "@sourcebot/db";
import { getMcpOAuthCallbackUrl } from "@/ee/features/chat/mcp/utils.server";
import { WorkspaceAskAgentPage } from "./workspaceAskAgentPage";
import { WorkspaceAskAgentEntitlementMessage } from "./workspaceAskAgentEntitlementMessage";

Expand DownExpand Up@@ -36,6 +37,7 @@ export default authenticatedPage<PageProps>(async ({ org, prisma }, { searchPara
callbackStatus={status}
callbackServer={server}
callbackMessage={message}
oauthRedirectUrl={getMcpOAuthCallbackUrl()}
/>
);
}, { minRole: OrgRole.OWNER, redirectTo: '/settings' });
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import { cn, isServiceError } from "@/lib/utils";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangleIcon, CableIcon, CopyIcon, Loader2, MoreHorizontalIcon, PlusIcon, Trash2Icon } from "lucide-react";
import { PrefabConnectorPopover } from "@/ee/features/chat/mcp/components/prefabConnectorPopover";
import type { PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import Markdown from "react-markdown";
import { getStaticOAuthDescription, type PrefabMcpServer } from "@/ee/features/chat/mcp/prefabMcpServers";
import type { McpConfigurationServer, ServerToolsEntry } from "@/ee/features/chat/mcp/types";

function clearCallbackParams() {
Expand All@@ -45,6 +46,7 @@ interface WorkspaceAskAgentPageProps {
callbackStatus?: string;
callbackServer?: string;
callbackMessage?: string;
oauthRedirectUrl: string;
}

type WorkspaceConnectorStatus = {
Expand DownExpand Up@@ -158,7 +160,7 @@ function WorkspaceConnectorCard({
);
}

export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage }: WorkspaceAskAgentPageProps) {
export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callbackMessage, oauthRedirectUrl }: WorkspaceAskAgentPageProps) {
const { toast } = useToast();
const queryClient = useQueryClient();
const router = useRouter();
Expand DownExpand Up@@ -581,8 +583,42 @@ export function WorkspaceAskAgentPage({ callbackStatus, callbackServer, callback
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>OAuth Client Credentials Required</DialogTitle>
<DialogDescription>
This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.
<DialogDescription asChild>
Comment thread
brendan-kellam marked this conversation as resolved.
<div className="text-sm text-muted-foreground">
<Markdown
components={{
p: ({ children }) => <p className="[&:not(:first-child)]:mt-2">{children}</p>,
a: ({ children, href }) => (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
className="text-link hover:underline"
>
{children}
</a>
),
code: ({ children }) => (
<span className="inline-flex items-center gap-1 align-middle">
<code className="bg-muted rounded px-1 py-0.5 text-xs break-all">{children}</code>
<button
type="button"
aria-label="Copy redirect URL"
className="text-muted-foreground hover:text-foreground"
onClick={() => {
navigator.clipboard.writeText(String(children));
toast({ title: "Copied", description: "Redirect URL copied to clipboard." });
}}
>
<CopyIcon className="h-3 w-3" />
</button>
</span>
),
}}
>
{getStaticOAuthDescription(pendingClientCredentialsServer?.serverUrl ?? "", oauthRedirectUrl)}
</Markdown>
</div>
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { env, createLogger } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
// Note: We use the raw (unscoped) prisma client here because this route handles OAuth
// redirect callbacks from external providers, so it can't go through withAuth. Session
// identity is verified via NextAuth's auth() instead, and all queries filter by userId.
Expand DownExpand Up@@ -166,7 +167,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
serverId: userServer.serverId,
orgId: userServer.server.orgId,
userId: session.user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

let result: Awaited<ReturnType<typeof mcpAuth>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { ConnectMcpResponse } from "@/app/api/(server)/ee/askmcp/connect/types";
import { createLogger, env } from "@sourcebot/shared";
import { __unsafePrisma } from '@/prisma';
import { getExternalMcpErrorLogFields } from '@/ee/features/chat/mcp/externalMcpError';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { ErrorCode } from '@/lib/errorCodes';
import { StatusCodes } from 'http-status-codes';
import { normalizeMcpOAuthReturnTo } from '@/ee/features/chat/mcp/mcpOAuthReturnTo';
Expand DownExpand Up@@ -130,7 +131,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
serverId: mcpServer.id,
orgId: org.id,
userId: user.id,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
callbackReturnTo,
allowClientRegistration: true,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/ee/features/chat/mcp/mcpClientFactory.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { createLogger, env } from '@sourcebot/shared';
import { createLogger } from '@sourcebot/shared';
import { PrismaOAuthClientProvider } from '@/ee/features/chat/mcp/prismaOAuthClientProvider';
import { getMcpOAuthCallbackUrl } from '@/ee/features/chat/mcp/utils.server';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import type { PrismaClient } from '@sourcebot/db';
import { getExternalMcpErrorLogFields } from './externalMcpError';
Expand DownExpand Up@@ -72,7 +73,7 @@ export async function getConnectedMcpClients(prisma: PrismaClient, userId: strin
serverId: userServer.serverId,
orgId,
userId,
callbackUrl: `${env.AUTH_URL}/api/ee/askmcp/callback`,
callbackUrl: getMcpOAuthCallbackUrl(),
});

const transport = new StreamableHTTPClientTransport(
Expand Down
23 changes: 23 additions & 0 deletions packages/web/src/ee/features/chat/mcp/prefabMcpServers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,14 @@ export interface PrefabMcpServer {
id: string;
name: string;
serverUrl: string;
descriptionOverride?: string;
}

export const DEFAULT_STATIC_OAUTH_DESCRIPTION =
"This connector does not advertise dynamic client registration. Provide OAuth client credentials from a pre-registered app before members can connect to it.";

export const OAUTH_REDIRECT_URL_PLACEHOLDER = "{{REDIRECT_URL}}";

const prefabMcpServers = [
{
id: "atlassian",
Expand All@@ -24,6 +30,8 @@ const prefabMcpServers = [
id: "slack",
name: "Slack",
serverUrl: "https://mcp.slack.com/mcp",
descriptionOverride:
"Slack doesn't support dynamic client registration, so you'll need to create an app in your Slack workspace and provide Sourcebot a Client ID and Secret. These are stored encrypted within your Sourcebot deployment.\n\nVisit [this page](https://api.slack.com/apps) to create a Slack app. Set the redirect URL (under OAuth & Permissions) to `{{REDIRECT_URL}}`",
},
] satisfies PrefabMcpServer[];

Expand All@@ -41,6 +49,21 @@ export function normalizeMcpServerUrlForComparison(serverUrl: string): string {
}
}

export function getStaticOAuthDescription(serverUrl: string, redirectUrl?: string): string {
const normalizedServerUrl = normalizeMcpServerUrlForComparison(serverUrl);
const prefabServer = PREFAB_MCP_SERVERS.find((server) => (
normalizeMcpServerUrlForComparison(server.serverUrl) === normalizedServerUrl
));

const description = prefabServer?.descriptionOverride ?? DEFAULT_STATIC_OAUTH_DESCRIPTION;

if (redirectUrl) {
return description.replaceAll(OAUTH_REDIRECT_URL_PLACEHOLDER, redirectUrl);
}

return description;
}

export function getAvailablePrefabMcpServers(configuredServerUrls: string[]): PrefabMcpServer[] {
const configuredServerUrlSet = new Set(
configuredServerUrls.map((serverUrl) => normalizeMcpServerUrlForComparison(serverUrl)),
Expand Down
9 changes: 9 additions & 0 deletions packages/web/src/ee/features/chat/mcp/utils.server.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import 'server-only';

import { env } from '@sourcebot/shared';

export const MCP_OAUTH_CALLBACK_PATH = '/api/ee/askmcp/callback';

export function getMcpOAuthCallbackUrl(): string {
return `${env.AUTH_URL}${MCP_OAUTH_CALLBACK_PATH}`;
}
Loading