feat: remove SAP Jira connection logic and update related comments for clarity

Author: kaifcoder

src/app/api/mcp/servers/for-agent/route.ts

@@ -1,7 +1,6 @@
 import { NextResponse } from 'next/server';
 import { auth } from '@clerk/nextjs/server';
 import { prisma } from '@/server/db';
-import { ensureSapJiraSeeded } from '@/lib/mcp-user-store';
 
 export const dynamic = 'force-dynamic';
 
@@ -13,7 +12,6 @@ export async function GET() {
   if (!userId) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
 
   try {
-    await ensureSapJiraSeeded(userId);
     const rows = await prisma.mcpServerConfig.findMany({
       where: { userId },
       orderBy: { createdAt: 'asc' },

src/app/api/mcp/servers/route.ts

@@ -6,7 +6,6 @@ import {
   validateInput,
   probeMcpServer,
   invalidateUserMcpToolsCache,
-  ensureSapJiraSeeded,
   type AuthType,
 } from '@/lib/mcp-user-store';
 
@@ -16,7 +15,6 @@ export async function GET() {
   const { userId } = await auth();
   if (!userId) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
   try {
-    await ensureSapJiraSeeded(userId);
     const servers = await listUserServers(userId);
     return NextResponse.json({ servers });
   } catch (err) {

src/components/settings/McpServerSettings.tsx

@@ -48,8 +48,8 @@ export function McpServerSettings() {
   const [addOpen, setAddOpen] = useState(false);
   const [deleteTarget, setDeleteTarget] = useState<UserMcpServer | null>(null);
   // ?connectLoopback=<id> on the URL means "open the loopback paste dialog
-  // for this server automatically." Set by the agent's sap_jira_connect tool
-  // (which emits a /api/mcp/servers/<id>/auth URL → that route 302s here).
+  // for this server automatically." The /api/mcp/servers/<id>/auth route
+  // 302s here when a server uses the loopback OAuth flow.
   const [autoConnectId, setAutoConnectId] = useState<string | null>(null);
 
   const refresh = async () => {

src/hooks/use-agent-stream.ts

@@ -266,14 +266,12 @@ export function useAgentStream() {
       }
 
       case "requiresMcpAuth": {
-        const label =
-          event.server === "sap-jira" ? "Connect Jira" : `Connect ${event.server}`;
-        toast.message(`${event.server === "sap-jira" ? "SAP Jira" : event.server} authorization required`, {
+        toast.message(`${event.server} authorization required`, {
           description: "Sign in once to let the agent access your data.",
           duration: Infinity,
           id: `mcp-auth-${event.server}`,
           action: {
-            label,
+            label: `Connect ${event.server}`,
             onClick: () => {
               window.open(event.authUrl, "_blank", "noopener,noreferrer");
             },

src/lib/agent.ts

@@ -137,58 +137,6 @@ const createSandboxTool = tool(
   }
 );
 
-// ─── SAP Jira Connect Tool (OAuth bootstrap) ───────────────────────────────
-
-const SAP_JIRA_URL = 'https://mcp.jira.tools.sap/mcp';
-
-async function isSapJiraConnected(serverId: string, userId: string): Promise<boolean> {
-  const appUrl =
-    process.env.APP_URL ?? process.env.NEXT_PUBLIC_APP_URL ?? 'http://host.docker.internal:3000';
-  const internalSecret = process.env.INTERNAL_AGENT_SECRET;
-  if (!internalSecret) return false;
-  try {
-    const res = await fetch(
-      `${appUrl}/api/mcp/internal/servers/${serverId}/credentials?userId=${encodeURIComponent(userId)}`,
-      {
-        headers: { Authorization: `Bearer ${internalSecret}` },
-        cache: 'no-store',
-      },
-    );
-    if (!res.ok) return false;
-    const data = await res.json();
-    return Boolean(data?.oauth?.tokens?.access_token);
-  } catch {
-    return false;
-  }
-}
-
-const sapJiraConnectTool = tool(
-  async (_input: Record<string, never>, config: LangGraphRunnableConfig) => {
-    const userId = config.configurable?.userId as string | undefined;
-    if (!userId) {
-      return 'Cannot start SAP Jira connection: user is not signed in.';
-    }
-    const userServers = (config.configurable?.userMcpServers ?? []) as UserMcpServerConfig[];
-    const sapJira = userServers.find((s) => s.url === SAP_JIRA_URL);
-    if (!sapJira) {
-      return 'SAP Jira is not provisioned for this user yet. Ask the user to open Settings → Apps once so it can be seeded.';
-    }
-    // Tokens may have arrived since this agent run started (e.g. user just
-    // completed loopback connect). Check Next.js, not our own cache.
-    if (await isSapJiraConnected(sapJira.id, userId)) {
-      return 'SAP Jira IS connected. Tools are loading on the next message — tell the user to retry their request.';
-    }
-    const authUrl = `/api/mcp/servers/${sapJira.id}/auth`;
-    config.writer?.({ type: 'requiresMcpAuth', server: 'sap-jira', authUrl });
-    return 'SAP Jira is not connected yet. Tell the user to click the "Connect Jira" button shown in the chat to authorize, then ask them to retry their request.';
-  },
-  {
-    name: 'sap_jira_connect',
-    description: 'Initiate the SAP Jira OAuth flow when the user asks for Jira data but no sap_jira_* tools are available yet. Emits a UI prompt asking the user to authorize. Call once, then stop and wait for the user to retry.',
-    schema: z.object({}).describe('No arguments.'),
-  },
-);
-
 // ─── Dynamic System Prompt ──────────────────────────────────────────────────
 
 // Inject the calling user's MCP tools at model-call time. Server configs
@@ -243,21 +191,13 @@ const userMcpToolsMiddleware = createMiddleware({
   },
 });
 
-const SAP_JIRA_TOOL_HINT = `
-
-## SAP Jira Tools
-
-If the user asks about Jira issues / SAP tickets / sprints / boards and you do NOT see any tool names containing \`jira\` (e.g. \`SAP_Jira__jira_*\`) in your toolset, the user has not connected SAP Jira yet. Call \`sap_jira_connect\` once, then stop and wait — a "Connect Jira" button will appear in the UI for them to authorize. Do not retry until they confirm they've connected.`;
-
 function buildPrompt(templateType: TemplateType, sbxId?: string, sandboxUrl?: string): string {
   if (templateType === 'chat') {
-    // chat-agent-prompt already includes the SAP Jira hint, so no append.
     return createChatPrompt();
   }
-  const base = templateType === 'n8n'
+  return templateType === 'n8n'
     ? createN8nPrompt(sbxId, sandboxUrl)
     : createNextjsPrompt(sbxId, sandboxUrl);
-  return base + SAP_JIRA_TOOL_HINT;
 }
 
 const sandboxAwarePrompt = dynamicSystemPromptMiddleware(
@@ -320,7 +260,7 @@ const n8nMcpToolsMiddleware = createMiddleware({
 
 export const agent = createAgent({
   model,
-  tools: [setTemplateTool, createSandboxTool, sapJiraConnectTool, ...e2bTools],
+  tools: [setTemplateTool, createSandboxTool, ...e2bTools],
   middleware: [
     sandboxAwarePrompt,
     n8nMcpToolsMiddleware,

src/lib/chat-agent-prompt.ts

@@ -3,18 +3,14 @@ export function createChatPrompt(): string {
 
 ## What you do
 
-Answer questions, look things up, summarize, plan, explain. Use the MCP tools available to you when relevant. Built-in tools include Next.js docs lookup and n8n workflow knowledge. Users may also have added their own MCP servers (SAP Jira, GitHub, Linear, internal tools, etc.) via Settings → Apps; their tools are prefixed with the server name they chose (e.g. \`SAP_Jira__search_issues\`).
+Answer questions, look things up, summarize, plan, explain. Use the MCP tools available to you when relevant. Built-in tools include Next.js docs lookup and n8n workflow knowledge. Users may also have added their own MCP servers (GitHub, Linear, Jira, internal tools, etc.) via Settings → Apps; their tools are prefixed with the server name they chose. If the user asks about data from a service whose tools you don't currently have, tell them to connect it under Settings → Apps and stop — don't fabricate answers.
 
 ## What you DO NOT do
 
 - Do NOT call \`create_sandbox\` or any \`e2b_*\` tools. There is no sandbox in this mode.
 - Do NOT write code files unless the user pastes some and asks you to modify it inline as text in your reply.
 - Do NOT call \`set_template\` again — the user has already picked chat mode for this thread.
 
-## SAP Jira
-
-If the user asks about Jira issues / SAP tickets / sprints / boards and you do NOT see any tool names containing \`jira\` (e.g. \`SAP_Jira__jira_*\`) in your toolset, the user has not connected SAP Jira yet. Call \`sap_jira_connect\` once, then stop and wait — a "Connect Jira" button will appear in the UI for them to authorize. Do not retry until they confirm they've connected.
-
 ## Style
 
 Be direct and concise. Show source IDs (e.g., issue keys, URLs) so the user can verify. If a question is ambiguous, ask one clarifying question rather than guessing.`;

src/lib/mcp-client.ts

@@ -8,9 +8,9 @@ const cleanEnv = (extra: Record<string, string> = {}): Record<string, string> =>
   return { ...out, ...extra };
 };
 
-// System-managed MCP servers shared by all users. User-added servers (incl.
-// SAP Jira) live per-user in McpServerConfig and are loaded by
-// getUserMcpTools() — see mcp-user-store.ts.
+// System-managed MCP servers shared by all users. User-added servers live
+// per-user in McpServerConfig and are loaded by getUserMcpTools() — see
+// mcp-user-store.ts.
 const client = new MultiServerMCPClient({
   throwOnLoadError: false,
   prefixToolNameWithServerName: false,

src/lib/mcp-user-store.ts

@@ -36,9 +36,8 @@ function appUrl(): string {
 }
 
 // Servers whose IdP only accepts loopback redirect URIs (RFC 8252) because
-// the BTP / prod host isn't on their allowlist. For these we skip the normal
-// callback route and have the user paste the loopback URL back into the UI
-// after IAS dumps them on a dead localhost page.
+// their host allowlist won't include our prod URL. The user adds these via
+// Settings → Apps; OAuth is then completed by pasting the loopback URL back.
 const LOOPBACK_PORT = 33418;
 export const LOOPBACK_REDIRECT_URI = `http://127.0.0.1:${LOOPBACK_PORT}/callback`;
 const LOOPBACK_HOST_URLS = new Set<string>([
@@ -147,37 +146,6 @@ export async function deleteUserServer(userId: string, id: string) {
   return res.count > 0;
 }
 
-// Pre-populate the well-known SAP Jira MCP server for a user the first time
-// they hit settings. Keeps the per-user model clean while not making every
-// new user re-discover the URL by hand.
-const SAP_JIRA_NAME = 'SAP Jira';
-const SAP_JIRA_URL = 'https://mcp.jira.tools.sap/mcp';
-
-export async function ensureSapJiraSeeded(userId: string) {
-  const existing = await prisma.mcpServerConfig.findFirst({
-    where: { userId, url: SAP_JIRA_URL },
-    select: { id: true },
-  });
-  if (existing) return existing.id;
-  const row = await prisma.mcpServerConfig.create({
-    data: {
-      userId,
-      name: SAP_JIRA_NAME,
-      url: SAP_JIRA_URL,
-      authType: 'oauth',
-    },
-  });
-  return row.id;
-}
-
-export async function getSapJiraServerId(userId: string): Promise<string | null> {
-  const row = await prisma.mcpServerConfig.findFirst({
-    where: { userId, url: SAP_JIRA_URL },
-    select: { id: true },
-  });
-  return row?.id ?? null;
-}
-
 export function decryptBearer(row: { authType: string; encryptedBearerToken: string | null }): string | undefined {
   if (row.authType !== 'bearer' || !row.encryptedBearerToken) return undefined;
   return decrypt(row.encryptedBearerToken);