chore: Removed mcp server url settings from admin settings (#42208)

## Description
- Removed peripheral settings from MCP settings
- Now mcp toggle will require restart on single org instances


Fixes
https://linear.app/appsmith/issue/APP-15928/mcp-settings-toggle-should-require-a-restart-for-mcp-server-to-source

## Automation
/ok-to-test tags="@tag.All"

## Testing

> [!NOTE]
> **How CI runs on fork PRs — no action needed from you.**
> 1. **Workflow approval.** GitHub holds the first run on fork PRs until
a maintainer approves it, so a pause before any check appears is
expected.
> 2. **Credential-free checks.** Once approved, format, lint, typecheck,
unit tests, cyclic-dependency and compile-only build checks run without
repository secrets. Only the checks relevant to what you changed (client
/ server / RTS) will run, and their logs are safe to debug against.
> 3. **Maintainer-triggered checks.** Cypress, Playwright, Docker builds
and deploy previews need secrets, so a maintainer starts them with
`/approve-ci`, and `/build-deploy-preview` when hands-on testing is
needed. Approval is pinned to one commit — pushing again requires fresh
approval.
>
> The `awaiting-maintainer` / `awaiting-contributor` labels show whose
turn it is. You do **not** need `ok-to-test` or any slash command. Full
detail: [Pull request check
states](https://github.com/appsmithorg/appsmith/blob/release/contributions/CodeContributionsGuidelines.md#pull-request-check-states).

Select the validation relevant to this change:

- [ ] Client unit tests
- [ ] Server unit tests
- [ ] Cypress
- [ ] Playwright
- [ ] Deploy preview
- [ ] Not applicable

Suggested Cypress tags or specs:


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/34195617186>
> Commit: 584a55c
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=34195617186&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.All`
> Spec:
> <hr>Tue, 08 Sep 2026 07:42:19 UTC
<!-- end of auto-generated comment: Cypress test results  -->


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- MCP administration now exposes a single setting to enable or disable
MCP.
- Changes requiring a server restart are clearly identified, and the
Save and Restart action remains available.
- Organization configuration updates can automatically start
restart-status polling.

- **Bug Fixes**
- Improved handling of MCP configuration updates that require a restart.
- MCP internal secret changes no longer trigger an immediate server
restart; they are applied through the Save and Restart flow.

- **Tests**
  - Updated coverage for simplified MCP settings and restart behavior.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: sondermanish

app/client/src/ce/api/OrganizationApi.ts

@@ -16,6 +16,7 @@ export type UpdateOrganizationConfigResponse = ApiResponse<{
 export interface UpdateOrganizationConfigRequest {
   organizationConfiguration: Record<string, string>;
   needsRefresh?: boolean;
+  needsRestart?: boolean;
   isOnlyOrganizationSettings?: boolean;
   apiConfig?: AxiosRequestConfig;
 }

app/client/src/ce/pages/AdminSettings/config/mcpServer.ts

@@ -6,18 +6,9 @@ import {
   CategoryType,
   SettingCategories,
   SettingTypes,
-  SettingSubtype,
 } from "ee/pages/AdminSettings/config/types";
-import { getDefaultMcpServerUrl } from "ee/constants/mcp";
 import McpKeysPage from "pages/AdminSettings/Profile/McpKeysPage";
 
-const isMcpServerOff = (
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  values?: Record<string, any>,
-) =>
-  values?.mcpConfig?.enabled !== true && values?.["mcpConfig.enabled"] !== true;
-
 export const MCP_ENABLED_SETTING: Setting = {
   id: "mcpConfig.enabled",
   name: "mcpConfig.enabled",
@@ -30,55 +21,6 @@ export const MCP_ENABLED_SETTING: Setting = {
   defaultValue: false,
 };
 
-export const MCP_DATA_ENABLED_SETTING: Setting = {
-  id: "mcpConfig.dataEnabled",
-  name: "mcpConfig.dataEnabled",
-  category: SettingCategories.MCP_SERVER,
-  controlType: SettingTypes.TOGGLE,
-  label: "MCP data tools",
-  text: "Let agents work with datasources and queries (create datasources/queries, run read-only actions)",
-  helpText:
-    "* Disabled by default. Requires the MCP server above. All operations run under the connecting user's existing permissions; credentials are never exposed to agents.",
-  defaultValue: false,
-  isDisabled: isMcpServerOff,
-};
-
-export const MCP_SERVER_URL_SETTING: Setting = {
-  id: "mcpConfig.serverUrl",
-  name: "mcpConfig.serverUrl",
-  category: SettingCategories.MCP_SERVER,
-  controlType: SettingTypes.TEXTINPUT,
-  controlSubType: SettingSubtype.TEXT,
-  label: "MCP server URL",
-  subText: "MCP server URL which MCP clients should use to reach this instance",
-  placeholder: getDefaultMcpServerUrl(),
-  helpText:
-    "* URL MCP clients should use to reach this instance. Leave blank to use the default (this origin + /mcp). Set a custom value if Appsmith is behind a reverse proxy or a different public hostname.",
-  isDisabled: isMcpServerOff,
-
-  validate: (value: string) => {
-    if (value === undefined || value === "") {
-      return;
-    }
-
-    try {
-      const url = new URL(value);
-
-      if (url.protocol !== "http:" && url.protocol !== "https:") {
-        return "Enter an http(s) URL.";
-      }
-    } catch {
-      return "Enter a valid URL.";
-    }
-  },
-};
-
-const instanceSettings = [
-  MCP_ENABLED_SETTING,
-  MCP_DATA_ENABLED_SETTING,
-  MCP_SERVER_URL_SETTING,
-];
-
 export const mcpKeys: AdminConfigType = {
   icon: "robot-2",
   type: SettingCategories.MCP_KEYS,
@@ -96,17 +38,17 @@ export const config: AdminConfigType = {
   controlType: SettingTypes.GROUP,
   title: "MCP Server (BETA)",
   canSave: true,
-  settings: [MCP_ENABLED_SETTING, MCP_DATA_ENABLED_SETTING],
+  settings: [MCP_ENABLED_SETTING],
 };
 
 export const getMcpServerConfig = (
   isMultiOrgEnabled: boolean,
 ): AdminConfigType => {
   return isMultiOrgEnabled
-    ? { ...config, settings: [MCP_ENABLED_SETTING] }
+    ? config
     : {
         ...config,
         categoryType: CategoryType.INSTANCE,
-        settings: instanceSettings,
+        needsRestart: true,
       };
 };

app/client/src/ce/pages/AdminSettings/config/types.ts

@@ -120,6 +120,7 @@ export interface Category {
   subText?: string;
   isConnected?: boolean;
   needsRefresh?: boolean;
+  needsRestart?: boolean;
   children?: Category[];
   icon?: string;
   categoryType: string;
@@ -168,6 +169,7 @@ export interface AdminConfigType {
   canSave: boolean;
   isConnected?: boolean;
   needsRefresh?: boolean;
+  needsRestart?: boolean;
   icon?: string;
   categoryType: CategoryType;
   isEnterprise?: boolean;

app/client/src/ce/sagas/organizationSagas.tsx

@@ -143,6 +143,12 @@ export function* updateOrganizationConfigSaga(
       if (action.payload.needsRefresh) {
         location.reload();
       }
+
+      if (action.payload.needsRestart) {
+        yield put({
+          type: ReduxActionTypes.RESTART_SERVER_POLL,
+        });
+      }
     }
   } catch (error) {
     const errorObj = error as APIResponseError;

app/client/src/ce/utils/adminSettingsHelpers.test.ts

@@ -7,43 +7,35 @@ import {
 describe("MCP org config form mapping", () => {
   it("treats nested mcpConfig form fields as organization settings", () => {
     expect(isOrganizationConfig("mcpConfig.enabled")).toBe(true);
-    expect(isOrganizationConfig("mcpConfig.dataEnabled")).toBe(true);
-    expect(isOrganizationConfig("mcpConfig.serverUrl")).toBe(true);
     expect(isOrganizationConfig("APPSMITH_MCP_ENABLED")).toBe(false);
   });
 
-  it("flattens mcpConfig onto dotted form keys and fail-closes missing flags", () => {
+  it("flattens mcpConfig.enabled onto dotted form keys and fail-closes missing flags", () => {
     expect(
       flattenOrganizationConfigForSettingsForm({
         instanceName: "Appsmith",
         mcpConfig: {
           enabled: true,
-          dataEnabled: false,
-          serverUrl: "https://appsmith.example/mcp",
         },
       }),
     ).toEqual({
       instanceName: "Appsmith",
       "mcpConfig.enabled": true,
-      "mcpConfig.dataEnabled": false,
-      "mcpConfig.serverUrl": "https://appsmith.example/mcp",
       mcpConfig: {
         enabled: true,
-        dataEnabled: false,
-        serverUrl: "https://appsmith.example/mcp",
       },
     });
   });
 
   it("nests only changed mcpConfig fields on save", () => {
     expect(
       nestOrganizationConfigFromSettingsForm({
-        "mcpConfig.dataEnabled": true,
+        "mcpConfig.enabled": true,
         hideWatermark: true,
       }),
     ).toEqual({
       hideWatermark: true,
-      mcpConfig: { dataEnabled: true },
+      mcpConfig: { enabled: true },
     });
   });
 });

app/client/src/ce/utils/adminSettingsHelpers.ts

@@ -88,20 +88,12 @@ export const flattenOrganizationConfigForSettingsForm = (
       if (mcpConfig && typeof mcpConfig === "object") {
         const mcp = mcpConfig as Record<string, unknown>;
         const enabled = mcp.enabled === true;
-        const dataEnabled = mcp.dataEnabled === true;
 
         // Nested paths first: redux-form Field names like "mcpConfig.enabled" use lodash path get.
         // Dotted keys second: settingsMap / settingsConfig[id] lookups. lodash.set skips nesting
         // when the dotted own-property already exists.
         set(configs, "mcpConfig.enabled", enabled);
-        set(configs, "mcpConfig.dataEnabled", dataEnabled);
         configs["mcpConfig.enabled"] = enabled;
-        configs["mcpConfig.dataEnabled"] = dataEnabled;
-
-        if (typeof mcp.serverUrl === "string") {
-          set(configs, "mcpConfig.serverUrl", mcp.serverUrl);
-          configs["mcpConfig.serverUrl"] = mcp.serverUrl;
-        }
       }
 
       return;

app/client/src/pages/AdminSettings/SaveSettings.tsx

@@ -34,6 +34,7 @@ interface SaveAdminSettingsProps {
   isOnlyOrganizationConfig?: boolean;
   isSaving?: boolean;
   needsRefresh?: boolean;
+  needsRestart?: boolean;
   onSave?: () => void;
   onClear?: () => void;
   settings: Record<string, string>;
@@ -46,6 +47,7 @@ const saveAdminSettings = (props: SaveAdminSettingsProps) => {
     isOnlyOrganizationConfig = false,
     isSaving,
     needsRefresh = false,
+    needsRestart = false,
     onClear,
     onSave,
     settings,
@@ -58,9 +60,10 @@ const saveAdminSettings = (props: SaveAdminSettingsProps) => {
   if (needsRefresh) {
     saveButtonText = SAVE_AND_REFRESH_BUTTON;
   } else if (
-    isOnlyOrganizationConfig ||
-    (updatedOrganizationSettings?.length === Object.keys(settings).length &&
-      updatedOrganizationSettings?.length !== 0)
+    !needsRestart &&
+    (isOnlyOrganizationConfig ||
+      (updatedOrganizationSettings?.length === Object.keys(settings).length &&
+        updatedOrganizationSettings?.length !== 0))
   ) {
     saveButtonText = SAVE_BUTTON;
   }

app/client/src/pages/AdminSettings/SettingsForm.tsx

@@ -129,6 +129,7 @@ export function SettingsForm(
           organizationConfiguration: config,
           isOnlyOrganizationSettings: !isEnvAndOrganizationSettings,
           needsRefresh: details?.needsRefresh,
+          needsRestart: details?.needsRestart,
         }),
       );
 
@@ -313,6 +314,7 @@ export function SettingsForm(
             isOnlyOrganizationConfig={isOnlyOrganizationConfig}
             isSaving={props.isSaving}
             needsRefresh={details?.needsRefresh}
+            needsRestart={details?.needsRestart}
             onClear={onClear}
             onSave={onSave}
             settings={props.settings}

app/client/src/pages/AdminSettings/config/ConfigFactory.ts

@@ -47,6 +47,7 @@ export class ConfigFactory {
       categoryType: config.categoryType,
       isEnterprise: config.isEnterprise,
       needsRefresh: config.needsRefresh,
+      needsRestart: config.needsRestart,
       isFeatureEnabled: config.isFeatureEnabled,
       children: config?.children?.map((child) =>
         ConfigFactory.getCategory(child),

app/server/appsmith-server/src/main/java/com/appsmith/server/domains/McpConfig.java

@@ -6,27 +6,21 @@
 import java.io.Serializable;
 
 /**
- * Organization-owned MCP policy. All admin-facing MCP switches live here; the only remaining env var is
+ * Organization-owned MCP policy. The only admin-facing switch is {@code enabled}; the only remaining env var is
  * {@code APPSMITH_MCP_INTERNAL_SECRET} (install-time, never persisted on the organization).
  *
- * <p>Every flag is boxed. {@code null} and {@code false} both mean off — only {@link Boolean#TRUE} enables a
- * capability. Token lifetime is per-key ({@code keySpanDays}), not an org setting.
+ * <p>{@code enabled} is boxed. {@code null} and {@code false} both mean off — only {@link Boolean#TRUE} enables MCP.
+ * Token lifetime is per-key ({@code keySpanDays}), not an org setting.
  */
 @Data
 public class McpConfig implements Serializable {
 
     private Boolean enabled;
 
-    private Boolean dataEnabled;
-
-    private String serverUrl;
-
     public void copyNonSensitiveValues(McpConfig source) {
         if (source == null) {
             return;
         }
         enabled = ObjectUtils.defaultIfNull(source.getEnabled(), enabled);
-        dataEnabled = ObjectUtils.defaultIfNull(source.getDataEnabled(), dataEnabled);
-        serverUrl = ObjectUtils.defaultIfNull(source.getServerUrl(), serverUrl);
     }
 }