Error loading MCP servers
;
+ }
+
+ return (
+
+ {/* Header + Add button */}
+
+
+
+
+ ) : (
+
+ );
+}
\ No newline at end of file
diff --git a/packages/web/src/app/(app)/settings/mcpServers/page.tsx b/packages/web/src/app/(app)/settings/mcpServers/page.tsx
new file mode 100644
index 000000000..edfd780d6
--- /dev/null
+++ b/packages/web/src/app/(app)/settings/mcpServers/page.tsx
@@ -0,0 +1,14 @@
+import { McpServersPage } from "./mcpServersPage";
+
+interface PageProps {
+ searchParams: Promise<{
+ status?: string;
+ server?: string;
+ message?: string;
+ }>;
+}
+
+export default async function Page({ searchParams }: PageProps) {
+ const { status, server, message } = await searchParams;
+ return
+
+
+ {/* Server list */}
+ {isLoading ? (
+
+
+
+
+ MCP Servers
++ Connect external MCP servers to use with Ask Sourcebot. +
+
+ {Array.from({ length: 2 }).map((_, i) => (
+
+
+
+
+
+
+ ))}
+
+ ) : servers.length === 0 ? (
+
+
+ No MCP servers yet
++ Click "Add MCP Server" above to connect an external MCP server. +
+
+ {servers.map((server) => (
+
+
+
+
+ {server.isConnected && (
+
+
+
+
+ ))}
+
+ )}
+
+
+
+
+
+
+
+ Delete MCP Server
+
+ Are you sure you want to remove {server.name || server.serverUrl}? This will remove the server and your credentials from your list.
+
+
+
+ Cancel
+ handleDelete(server.id)}
+ disabled={deletingServerId === server.id}
+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+ >
+ {deletingServerId === server.id ? "Deleting..." : "Delete"}
+
+
+
+
+
+
+
+
+ {server.name || server.serverUrl}
+ {server.serverUrl}
+
+
+
+ Connected
+
+ )}
+ {server.isAuthExpired && (
+
+
+ Authorization expired
+
+ )}
+ {!server.isConnected && !server.isAuthExpired && (
+
+
+ Not connected
+
+ )}
+
+ {server.isAuthExpired ? (
+ 
onFaviconError(server.id)}
+ className="w-4 h-4 shrink-0 rounded-sm"
+ alt=""
+ />
+ )}
+ {server.name}
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/packages/web/src/features/chat/components/chatThread/chatThread.tsx b/packages/web/src/features/chat/components/chatThread/chatThread.tsx
index 9394e62d0..3e16bb5aa 100644
--- a/packages/web/src/features/chat/components/chatThread/chatThread.tsx
+++ b/packages/web/src/features/chat/components/chatThread/chatThread.tsx
@@ -7,10 +7,10 @@ import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
-import { CreateUIMessage, DefaultChatTransport } from 'ai';
+import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
import { useNavigationGuard } from 'next-navigation-guard';
-import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
+import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useStickToBottom } from 'use-stick-to-bottom';
import { Descendant } from 'slate';
import { useMessagePairs } from '../../useMessagePairs';
@@ -19,12 +19,15 @@ import { ChatBox } from '../chatBox';
import { ChatBoxToolbar } from '../chatBox/chatBoxToolbar';
import { ChatThreadListItem } from './chatThreadListItem';
import { ErrorBanner } from './errorBanner';
+import { McpFailedServersBanner } from './mcpFailedServersBanner';
import { useRouter } from 'next/navigation';
import { usePrevious } from '@uidotdev/usehooks';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { duplicateChat, generateAndUpdateChatNameFromMessage } from '../../actions';
import { isServiceError } from '@/lib/utils';
import { NotConfiguredErrorBanner } from '../notConfiguredErrorBanner';
+import { McpServerIconContext, McpServerIconMap } from '../../mcpServerIconContext';
+import { ToolApprovalProvider } from '../../toolApprovalContext';
import useCaptureEvent from '@/hooks/useCaptureEvent';
import { SignInPromptBanner } from './signInPromptBanner';
import { DuplicateChatDialog } from '@/app/(app)/chat/components/duplicateChatDialog';
@@ -42,6 +45,8 @@ interface ChatThreadProps {
searchContexts: SearchContextQuery[];
selectedSearchScopes: SearchScope[];
onSelectedSearchScopesChange: (items: SearchScope[]) => void;
+ disabledMcpServerIds: string[];
+ onDisabledMcpServerIdsChange: (ids: string[]) => void;
isOwner?: boolean;
isAuthenticated: boolean;
isLoginWallEnabled: boolean;
@@ -57,6 +62,8 @@ export const ChatThread = ({
searchContexts,
selectedSearchScopes,
onSelectedSearchScopesChange,
+ disabledMcpServerIds,
+ onDisabledMcpServerIdsChange,
isOwner = true,
isAuthenticated,
isLoginWallEnabled,
@@ -80,13 +87,66 @@ export const ChatThread = ({
) ?? []
);
+ const [mcpServerIconMap, setMcpServerIconMap] = useState
+
+ Extra Features
+
+ Add MCP servers, include files and more.
+
+