- {githubConfigured ? (
-
- ) : (
-
-
-
-
-
-
-
- not configured
-
-
-
+ {value ?
:
}
+ {key}
+
+ )
+
+ const renderToolRow = (tool: McpTool) => {
+ const annotations = Object.entries(tool.annotations).filter(
+ ([, v]) => typeof v === 'boolean'
+ )
+ return (
+
+
{tool.name}
+ {annotations.length > 0 && (
+
+ {annotations.map(([k, v]) => renderAnnotationBadge(k, v as boolean))}
+
+ )}
+
+ )
+ }
+
+ const renderServerCard = (server: McpServer) => {
+ const tools = server.tools ?? []
+ const toolCount = tools.length
+
+ return (
+
+
+
+
+ {getStatusIcon(server)}
+
+
{server.displayName}
+
+
+ {server.version && (
+
v{server.version}
+ )}
+ {toolCount > 0 && (
+
+
+
+ {toolCount} {toolCount === 1 ? 'tool' : 'tools'}
+
+
+
+
+
+ {server.displayName} — {toolCount} {toolCount === 1 ? 'tool' : 'tools'}
+
+
+ {tools.map((tool) => renderToolRow(tool))}
+
+
+
)}
-
GitHub
-
- {githubConfigured ? (
- 'MCP access to GitHub repositories.'
- ) : (
+
+ {getStatusBadge(server)}
+
+
+ )
+ }
+
+ return (
+
+
+
+
+
MCP Servers
+ {!showPlaceholders && mcpServers.length > 0 && (
+
+ {mcpServers.length}
+
+ )}
+
+
+
+ {showPlaceholders ? (
<>
- Session started without GitHub MCP. Configure{' '}
-
- Integrations
- {' '}
- and start a new session.
+ {renderCardSkeleton()}
+ {renderCardSkeleton()}
+ ) : mcpServers.length > 0 ? (
+ mcpServers.map((server) => renderServerCard(server))
+ ) : (
+
+ No MCP servers available for this session.
+
)}
-
+
+
+ )
+}
+
+// ─── Integrations Accordion ──────────────────────────────────────────────────
+
+export function IntegrationsAccordion() {
+ const { data: integrationsStatus, isPending } = useIntegrationsStatus()
+
+ const githubConfigured = integrationsStatus?.github?.active != null
+ const gitlabConfigured = integrationsStatus?.gitlab?.connected ?? false
+ const jiraConfigured = integrationsStatus?.jira?.connected ?? false
+ const googleConfigured = integrationsStatus?.google?.connected ?? false
+
+ const integrations = [
+ {
+ key: 'github',
+ name: 'GitHub',
+ configured: githubConfigured,
+ configuredMessage: 'Authenticated. Git push and repository access enabled.',
+ },
+ {
+ key: 'gitlab',
+ name: 'GitLab',
+ configured: gitlabConfigured,
+ configuredMessage: 'Authenticated. Git push and repository access enabled.',
+ },
+ {
+ key: 'google',
+ name: 'Google Workspace',
+ configured: googleConfigured,
+ configuredMessage: 'Authenticated. Drive, Calendar, and Gmail access enabled.',
+ },
+ {
+ key: 'jira',
+ name: 'Jira',
+ configured: jiraConfigured,
+ configuredMessage: 'Authenticated. Issue and project access enabled.',
+ },
+ ].sort((a, b) => a.name.localeCompare(b.name))
+
+ const configuredCount = integrations.filter((i) => i.configured).length
+
+ const renderCardSkeleton = () => (
+
- )
+ )
- const renderGitLabCard = () =>
- integrationStatusPending ? (
- renderCardSkeleton()
- ) : (
+ const renderIntegrationCard = (integration: (typeof integrations)[number]) => (
- {gitlabConfigured ? (
+ {integration.configured ? (
) : (
@@ -184,244 +308,77 @@ export function McpIntegrationsAccordion({
- not configured
+ Not configured
)}
-
GitLab
+
{integration.name}
- {gitlabConfigured ? (
- 'MCP access to GitLab repositories.'
+ {integration.configured ? (
+ integration.configuredMessage
) : (
<>
- Session started without GitLab MCP. Configure{' '}
+ Not connected.{' '}
- )
-
- const renderServerCard = (server: McpServer) => (
-
-
-
-
- {server.authenticated === false ? (
-
-
-
- {getStatusIcon(server)}
-
-
- not configured
-
-
-
- ) : (
- getStatusIcon(server)
- )}
-
-
{getDisplayName(server)}
-{server.name === 'mcp-atlassian' && server.authenticated === true && (
-
- read only
-
- )}
-
- {getDescription(server) && (
-
- {getDescription(server)}
-
- )}
-
-
- {getRightContent(server)}
-
-
)
- const getDisplayName = (server: McpServer) =>
- server.name === 'mcp-atlassian' ? 'Jira' : server.displayName
-
- const getDescription = (server: McpServer): ReactNode => {
- if (server.name === 'webfetch') return 'Fetches web content for the session.'
- if (server.name === 'mcp-atlassian') {
- if (server.authenticated === false) {
- return (
- <>
- Session started without Jira MCP. Configure{' '}
-
- Integrations
- {' '}
- and start a new session.
-
- )
- }
- return 'MCP access to Jira issues and projects.'
- }
- if (server.name === 'google-workspace') {
- if (server.authenticated === false) {
- return (
- <>
- Session started without Google Workspace MCP. Configure{' '}
-
- Integrations
- {' '}
- and start a new session.
-
- )
- }
- return 'MCP access to Google Drive files.'
- }
- return server.authMessage ?? null
- }
-
- const getStatusIcon = (server: McpServer) => {
- // If we have auth info, use that for the icon
- if (server.authenticated !== undefined) {
- if (server.authenticated === true) {
- return
- } else if (server.authenticated === null) {
- // Null = needs refresh/uncertain state
- return
- } else {
- // False = not authenticated/not configured
- return
- }
- }
-
- // Fall back to status-based icons
- switch (server.status) {
- case 'configured':
- case 'connected':
- return
- case 'error':
- return
- case 'disconnected':
- default:
- return
- }
- }
-
- const getRightContent = (server: McpServer) => {
- // Webfetch: no badge
- if (server.name === 'webfetch') return null
-
- // Jira not authenticated: no link (description explains to configure and start new session)
-
- // Google Workspace not authenticated: no link (description explains to configure and start new session)
-
- // Jira connected: no badge
- if (server.name === 'mcp-atlassian' && server.authenticated === true) return null
-
- // Authenticated: show badge (with optional tooltip)
- if (server.authenticated === true) {
- const badge = (
-
-
- )
- if (server.authMessage) {
- return (
-
-
- {badge}
-
- {server.authMessage}
-
-
-
- )
- }
- return badge
- }
-
- // Other servers with auth status but not authenticated: no badge (only Jira/Google get links above)
- if (server.authenticated === false) return null
-
- // Fall back to status-based badges (for servers without auth info; webfetch already returns null)
- switch (server.status) {
- case 'configured':
- return (
-
- Configured
-
- )
- case 'connected':
- return (
-
- Connected
-
- )
- case 'error':
- return (
-
- Error
-
- )
- case 'disconnected':
- default:
- return (
-
- Disconnected
-
- )
- }
- }
-
- // Combine all integrations (GitHub + GitLab + all MCP servers)
- type IntegrationItem =
- | { type: 'github'; displayName: string }
- | { type: 'gitlab'; displayName: string }
- | { type: 'server'; displayName: string; server: McpServer }
- const allIntegrations: IntegrationItem[] = [
- { type: 'github' as const, displayName: 'GitHub' },
- { type: 'gitlab' as const, displayName: 'GitLab' },
- ...allServers.map((server) => ({ type: 'server' as const, displayName: getDisplayName(server), server })),
- ].sort((a, b) => a.displayName.localeCompare(b.displayName))
-
return (
- <>
-
+
-
+
Integrations
+ {!isPending && (
+
+ {configuredCount}/{integrations.length}
+
+ )}
- {showPlaceholders ? (
+ {isPending ? (
<>
{renderCardSkeleton()}
{renderCardSkeleton()}
+ {renderCardSkeleton()}
) : (
- allIntegrations.map((item) => {
- if (item.type === 'github') {
- return
{renderGitHubCard()}
- } else if (item.type === 'gitlab') {
- return
{renderGitLabCard()}
- } else {
- return renderServerCard(item.server)
- }
- })
+ integrations.map((integration) => renderIntegrationCard(integration))
)}
+ )
+}
+
+// ─── Legacy export (renders both) ────────────────────────────────────────────
+
+type McpIntegrationsAccordionProps = {
+ projectName: string
+ sessionName: string
+}
+
+/** @deprecated Use McpServersAccordion + IntegrationsAccordion separately */
+export function McpIntegrationsAccordion({
+ projectName,
+ sessionName,
+}: McpIntegrationsAccordionProps) {
+ return (
+ <>
+ [s.key, s.value]))
- : {};
- const atlassianConfigured =
- !!(byKey.JIRA_URL?.trim() && byKey.JIRA_PROJECT?.trim() && byKey.JIRA_EMAIL?.trim() && byKey.JIRA_API_TOKEN?.trim());
+ const atlassianConfigured = integrationsStatus?.jira?.connected ?? false;
+ const googleConfigured = integrationsStatus?.google?.connected ?? false;
const form = useForm({
resolver: zodResolver(formSchema),
@@ -201,24 +193,21 @@ export function CreateSessionDialog({
)}
/>
- {/* Integration status (same visual style as integrations accordion), alphabetical: Jira, GitHub, Google Workspace */}
+ {/* Integration auth status */}
Integrations
- {/* Jira card */}
- {atlassianConfigured ? (
+ {/* GitHub card */}
+ {githubConfigured ? (
-
Jira
-
- read only
-
+
GitHub
- MCP access to Jira issues and projects.
+ Authenticated. Git push and repository access enabled.
@@ -228,32 +217,29 @@ export function CreateSessionDialog({
-
Jira
+
GitHub
- Configure{" "}
-
)}
- {/* GitHub card */}
- {githubConfigured ? (
+ {/* GitLab card */}
+ {gitlabConfigured ? (
@@ -263,29 +249,29 @@ export function CreateSessionDialog({