Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

refactor(web): move MCP tools under the server folder (#16696)

Nikita Kabardin068579e67cd4
diff --git a/web/src/__tests__/server/mcp-public-api-tools.servertest.ts b/web/src/__tests__/server/mcp-public-api-tools.servertest.ts
index d668e17884..31c73c0685 100644
--- a/web/src/__tests__/server/mcp-public-api-tools.servertest.ts
+++ b/web/src/__tests__/server/mcp-public-api-tools.servertest.ts
@@ -62,12 +62,12 @@ import {
handleListAnnotationQueueItems,
handleListAnnotationQueues,
handleUpdateAnnotationQueueItem,
-} from "@/src/features/mcp/features/annotationQueues/tools";
+} from "@/src/features/mcp/server/annotationQueues/tools";
import {
handleCreateComment,
handleGetComment,
handleListComments,
-} from "@/src/features/mcp/features/comments/tools";
+} from "@/src/features/mcp/server/comments/tools";
import {
handleCreateDatasetRunItem,
handleDeleteDatasetItem,
@@ -82,18 +82,18 @@ import {
handleUpsertDataset,
handleUpsertDatasetItem,
upsertDatasetTool,
-} from "@/src/features/mcp/features/datasets/tools";
-import { handleGetHealth } from "@/src/features/mcp/features/health/tools";
+} from "@/src/features/mcp/server/datasets/tools";
+import { handleGetHealth } from "@/src/features/mcp/server/health/tools";
import {
handleCreateModel,
handleDeleteModel,
handleGetModel,
handleListModels,
-} from "@/src/features/mcp/features/models/tools";
-import { handleCreateScoreConfig } from "@/src/features/mcp/features/scores/tools/createScoreConfig";
-import { handleGetScoreConfig } from "@/src/features/mcp/features/scores/tools/getScoreConfig";
-import { handleListScoreConfigs } from "@/src/features/mcp/features/scores/tools/listScoreConfigs";
-import { handleUpdateScoreConfig } from "@/src/features/mcp/features/scores/tools/updateScoreConfig";
+} from "@/src/features/mcp/server/models/tools";
+import { handleCreateScoreConfig } from "@/src/features/mcp/server/scores/tools/createScoreConfig";
+import { handleGetScoreConfig } from "@/src/features/mcp/server/scores/tools/getScoreConfig";
+import { handleListScoreConfigs } from "@/src/features/mcp/server/scores/tools/listScoreConfigs";
+import { handleUpdateScoreConfig } from "@/src/features/mcp/server/scores/tools/updateScoreConfig";
const createScoreConfig = async (projectId: string) =>
prisma.scoreConfig.create({
diff --git a/web/src/__tests__/server/mcp-tools-read.servertest.ts b/web/src/__tests__/server/mcp-tools-read.servertest.ts
index 796b6cdb28..1137a4305f 100644
--- a/web/src/__tests__/server/mcp-tools-read.servertest.ts
+++ b/web/src/__tests__/server/mcp-tools-read.servertest.ts
@@ -70,7 +70,7 @@ import {
import { env } from "@/src/env.mjs";
import "@/src/features/mcp/server/bootstrap";
import { toolRegistry } from "@/src/features/mcp/server/registry";
-import { handleCreateDashboardWidget } from "@/src/features/mcp/features/dashboardWidgets/tools/createDashboardWidget";
+import { handleCreateDashboardWidget } from "@/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget";
import {
getDashboardTool,
getDashboardWidgetTool,
@@ -81,122 +81,122 @@ import {
handleListDashboardWidgets,
listDashboardsTool,
listDashboardWidgetsTool,
-} from "@/src/features/mcp/features/dashboardWidgets/tools/dashboardCrud";
+} from "@/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud";
// Import MCP tool handlers directly
import {
getObservationTool,
handleGetObservation,
-} from "@/src/features/mcp/features/observations/tools/getObservation";
+} from "@/src/features/mcp/server/observations/tools/getObservation";
import {
getObservationFieldSchemaTool,
handleGetObservationFieldSchema,
-} from "@/src/features/mcp/features/observations/tools/getObservationFieldSchema";
+} from "@/src/features/mcp/server/observations/tools/getObservationFieldSchema";
import {
getObservationFilterSchemaTool,
handleGetObservationFilterSchema,
-} from "@/src/features/mcp/features/observations/tools/getObservationFilterSchema";
+} from "@/src/features/mcp/server/observations/tools/getObservationFilterSchema";
import {
getObservationFilterValuesTool,
handleGetObservationFilterValues,
-} from "@/src/features/mcp/features/observations/tools/getObservationFilterValues";
+} from "@/src/features/mcp/server/observations/tools/getObservationFilterValues";
import {
listObservationsTool,
handleListObservations,
-} from "@/src/features/mcp/features/observations/tools/listObservations";
+} from "@/src/features/mcp/server/observations/tools/listObservations";
import {
getMetricsSchemaTool,
handleGetMetricsSchema,
-} from "@/src/features/mcp/features/metrics/tools/getMetricsSchema";
+} from "@/src/features/mcp/server/metrics/tools/getMetricsSchema";
import {
queryMetricsTool,
handleQueryMetrics,
-} from "@/src/features/mcp/features/metrics/tools/queryMetrics";
+} from "@/src/features/mcp/server/metrics/tools/queryMetrics";
import {
getPromptTool,
handleGetPrompt,
-} from "@/src/features/mcp/features/prompts/tools/getPrompt";
+} from "@/src/features/mcp/server/prompts/tools/getPrompt";
import {
getPromptUnresolvedTool,
handleGetPromptUnresolved,
-} from "@/src/features/mcp/features/prompts/tools/getPromptUnresolved";
+} from "@/src/features/mcp/server/prompts/tools/getPromptUnresolved";
import {
listPromptsTool,
handleListPrompts,
-} from "@/src/features/mcp/features/prompts/tools/listPrompts";
+} from "@/src/features/mcp/server/prompts/tools/listPrompts";
import {
createScoreConfigTool,
handleCreateScoreConfig,
-} from "@/src/features/mcp/features/scores/tools/createScoreConfig";
+} from "@/src/features/mcp/server/scores/tools/createScoreConfig";
import {
createScoreTool,
handleCreateScore,
-} from "@/src/features/mcp/features/scores/tools/createScore";
+} from "@/src/features/mcp/server/scores/tools/createScore";
import {
deleteScoreConfigTool,
handleDeleteScoreConfig,
-} from "@/src/features/mcp/features/scores/tools/deleteScoreConfig";
+} from "@/src/features/mcp/server/scores/tools/deleteScoreConfig";
import {
getScoreTool,
handleGetScore,
-} from "@/src/features/mcp/features/scores/tools/getScore";
+} from "@/src/features/mcp/server/scores/tools/getScore";
import {
getScoreConfigTool,
handleGetScoreConfig,
-} from "@/src/features/mcp/features/scores/tools/getScoreConfig";
+} from "@/src/features/mcp/server/scores/tools/getScoreConfig";
import {
listScoreConfigsTool,
handleListScoreConfigs,
-} from "@/src/features/mcp/features/scores/tools/listScoreConfigs";
+} from "@/src/features/mcp/server/scores/tools/listScoreConfigs";
import {
listScoresTool,
handleListScores,
-} from "@/src/features/mcp/features/scores/tools/listScores";
+} from "@/src/features/mcp/server/scores/tools/listScores";
import {
updateScoreConfigTool,
handleUpdateScoreConfig,
-} from "@/src/features/mcp/features/scores/tools/updateScoreConfig";
+} from "@/src/features/mcp/server/scores/tools/updateScoreConfig";
import {
getMediaTool,
handleGetMedia,
-} from "@/src/features/mcp/features/media/tools/getMedia";
+} from "@/src/features/mcp/server/media/tools/getMedia";
import {
getEvaluatorTool,
handleGetEvaluator,
-} from "@/src/features/mcp/features/evals/tools/getEvaluator";
+} from "@/src/features/mcp/server/evals/tools/getEvaluator";
import {
listEvaluatorsTool,
handleListEvaluators,
-} from "@/src/features/mcp/features/evals/tools/listEvaluators";
+} from "@/src/features/mcp/server/evals/tools/listEvaluators";
import {
handleListManagedEvaluatorTemplates,
listManagedEvaluatorTemplatesTool,
-} from "@/src/features/mcp/features/evals/tools/listManagedEvaluatorTemplates";
+} from "@/src/features/mcp/server/evals/tools/listManagedEvaluatorTemplates";
import {
getEvaluationRuleTool,
handleGetEvaluationRule,
-} from "@/src/features/mcp/features/evals/tools/getEvaluationRule";
+} from "@/src/features/mcp/server/evals/tools/getEvaluationRule";
import {
listEvaluationRulesTool,
handleListEvaluationRules,
-} from "@/src/features/mcp/features/evals/tools/listEvaluationRules";
-import { handleCreateEvaluator } from "@/src/features/mcp/features/evals/tools/createEvaluator";
-import { handleCreateEvaluationRule } from "@/src/features/mcp/features/evals/tools/createEvaluationRule";
+} from "@/src/features/mcp/server/evals/tools/listEvaluationRules";
+import { handleCreateEvaluator } from "@/src/features/mcp/server/evals/tools/createEvaluator";
+import { handleCreateEvaluationRule } from "@/src/features/mcp/server/evals/tools/createEvaluationRule";
import {
getMonitorTool,
handleGetMonitor,
-} from "@/src/features/mcp/features/monitors/tools/getMonitor";
+} from "@/src/features/mcp/server/monitors/tools/getMonitor";
import {
listMonitorsTool,
handleListMonitors,
-} from "@/src/features/mcp/features/monitors/tools/listMonitors";
+} from "@/src/features/mcp/server/monitors/tools/listMonitors";
import {
GetDatasetItemsMcpInput,
GetDatasetMcpInput,
GetDatasetRunMcpInput,
GetDatasetRunsMcpInput,
GetDatasetsMcpInput,
-} from "@/src/features/mcp/features/datasets/schema";
+} from "@/src/features/mcp/server/datasets/schema";
const maybeEventsTable =
env.LANGFUSE_MIGRATION_V4_ALLOW_PREVIEW_OPT_IN === "true"
diff --git a/web/src/__tests__/server/mcp-tools-write.servertest.ts b/web/src/__tests__/server/mcp-tools-write.servertest.ts
index fa7710da31..8b70122d8c 100644
--- a/web/src/__tests__/server/mcp-tools-write.servertest.ts
+++ b/web/src/__tests__/server/mcp-tools-write.servertest.ts
@@ -54,48 +54,48 @@ import {
import {
DeleteDatasetRunMcpInput,
PostDatasetItemMcpInput,
-} from "@/src/features/mcp/features/datasets/schema";
+} from "@/src/features/mcp/server/datasets/schema";
// Import MCP tool handlers directly
-import { handleCreateTextPrompt } from "@/src/features/mcp/features/prompts/tools/createTextPrompt";
-import { handleCreateChatPrompt } from "@/src/features/mcp/features/prompts/tools/createChatPrompt";
-import { handleUpdatePromptLabels } from "@/src/features/mcp/features/prompts/tools/updatePromptLabels";
-import { handleCreateAnnotationQueue } from "@/src/features/mcp/features/annotationQueues/tools";
+import { handleCreateTextPrompt } from "@/src/features/mcp/server/prompts/tools/createTextPrompt";
+import { handleCreateChatPrompt } from "@/src/features/mcp/server/prompts/tools/createChatPrompt";
+import { handleUpdatePromptLabels } from "@/src/features/mcp/server/prompts/tools/updatePromptLabels";
+import { handleCreateAnnotationQueue } from "@/src/features/mcp/server/annotationQueues/tools";
import {
createEvaluatorTool,
handleCreateEvaluator,
-} from "@/src/features/mcp/features/evals/tools/createEvaluator";
+} from "@/src/features/mcp/server/evals/tools/createEvaluator";
import {
updateEvaluatorTool,
handleUpdateEvaluator,
-} from "@/src/features/mcp/features/evals/tools/updateEvaluator";
+} from "@/src/features/mcp/server/evals/tools/updateEvaluator";
import {
createEvaluationRuleTool,
handleCreateEvaluationRule,
-} from "@/src/features/mcp/features/evals/tools/createEvaluationRule";
+} from "@/src/features/mcp/server/evals/tools/createEvaluationRule";
import {
updateEvaluationRuleTool,
handleUpdateEvaluationRule,
-} from "@/src/features/mcp/features/evals/tools/updateEvaluationRule";
+} from "@/src/features/mcp/server/evals/tools/updateEvaluationRule";
import {
deleteEvaluationRuleTool,
handleDeleteEvaluationRule,
-} from "@/src/features/mcp/features/evals/tools/deleteEvaluationRule";
+} from "@/src/features/mcp/server/evals/tools/deleteEvaluationRule";
import {
deleteEvaluatorTool,
handleDeleteEvaluator,
-} from "@/src/features/mcp/features/evals/tools/deleteEvaluator";
-import { handleGetEvaluationRule } from "@/src/features/mcp/features/evals/tools/getEvaluationRule";
+} from "@/src/features/mcp/server/evals/tools/deleteEvaluator";
+import { handleGetEvaluationRule } from "@/src/features/mcp/server/evals/tools/getEvaluationRule";
import {
attachEvaluatorToEvaluationRuleTool,
detachEvaluatorFromEvaluationRuleTool,
handleAttachEvaluatorToEvaluationRule,
handleDetachEvaluatorFromEvaluationRule,
-} from "@/src/features/mcp/features/evals/tools/manageEvaluationRuleEvaluators";
+} from "@/src/features/mcp/server/evals/tools/manageEvaluationRuleEvaluators";
import {
createDashboardWidgetTool,
handleCreateDashboardWidget,
-} from "@/src/features/mcp/features/dashboardWidgets/tools/createDashboardWidget";
+} from "@/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget";
import {
handleAddDashboardPlacement,
handleCreateDashboard,
@@ -107,7 +107,7 @@ import {
handleUpdateDashboardPlacement,
handleUpdateDashboard,
handleUpdateDashboardWidget,
-} from "@/src/features/mcp/features/dashboardWidgets/tools/dashboardCrud";
+} from "@/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud";
const createScoreConfig = async (projectId: string) =>
prisma.scoreConfig.create({
diff --git a/web/src/__tests__/server/unit/evaluator-input.servertest.ts b/web/src/__tests__/server/unit/evaluator-input.servertest.ts
index a03a62897c..f95c04d096 100644
--- a/web/src/__tests__/server/unit/evaluator-input.servertest.ts
+++ b/web/src/__tests__/server/unit/evaluator-input.servertest.ts
@@ -4,7 +4,7 @@ import { z } from "zod";
import {
McpEvaluatorInput,
McpEvaluatorInputBase,
-} from "@/src/features/mcp/features/evals/tools/evaluatorInput";
+} from "@/src/features/mcp/server/evals/tools/evaluatorInput";
const llmEvaluatorInput = {
name: "Answer quality",
diff --git a/web/src/__tests__/server/unit/feedback-service.servertest.ts b/web/src/__tests__/server/unit/feedback-service.servertest.ts
index 8db09346e6..7fe2e7b3b5 100644
--- a/web/src/__tests__/server/unit/feedback-service.servertest.ts
+++ b/web/src/__tests__/server/unit/feedback-service.servertest.ts
@@ -40,7 +40,7 @@ import {
isProductFeedbackAvailable,
submitFeedback,
} from "@/src/features/feedback/server/FeedbackService";
-import { feedbackFeature } from "@/src/features/mcp/features/feedback";
+import { feedbackFeature } from "@/src/features/mcp/server/feedback";
import { getMcpServerInstructions } from "@/src/features/mcp/server/mcpServer";
import { PostFeedbackBody } from "@/src/features/public-api/types/feedback";
diff --git a/web/src/__tests__/server/unit/mcp-create-chat-prompt-placeholder.servertest.ts b/web/src/__tests__/server/unit/mcp-create-chat-prompt-placeholder.servertest.ts
index b64b8d6611..4756649a67 100644
--- a/web/src/__tests__/server/unit/mcp-create-chat-prompt-placeholder.servertest.ts
+++ b/web/src/__tests__/server/unit/mcp-create-chat-prompt-placeholder.servertest.ts
@@ -3,7 +3,7 @@ import { describe, expect, it } from "vitest";
import {
ChatMessageSchema,
createChatPromptTool,
-} from "@/src/features/mcp/features/prompts/tools/createChatPrompt";
+} from "@/src/features/mcp/server/prompts/tools/createChatPrompt";
type JsonSchema = Record<string, unknown>;
diff --git a/web/src/__tests__/server/unit/mcp-v4-migration.servertest.ts b/web/src/__tests__/server/unit/mcp-v4-migration.servertest.ts
index db5d437819..bb2f14a60f 100644
--- a/web/src/__tests__/server/unit/mcp-v4-migration.servertest.ts
+++ b/web/src/__tests__/server/unit/mcp-v4-migration.servertest.ts
@@ -15,7 +15,7 @@ vi.mock("@langfuse/shared/src/db", () => ({
import {
getV4MigrationDataTool,
handleGetV4MigrationData,
-} from "@/src/features/mcp/features/v4Migration/tools/getV4MigrationData";
+} from "@/src/features/mcp/server/v4Migration/tools/getV4MigrationData";
import { mockServerContext } from "@/src/__tests__/server/mcp-helpers";
describe("getV4MigrationData MCP tool", () => {
diff --git a/web/src/features/mcp/core/validation.ts b/web/src/features/mcp/core/validation.ts
index 6f8ca39642..6d14d6968a 100644
--- a/web/src/features/mcp/core/validation.ts
+++ b/web/src/features/mcp/core/validation.ts
@@ -6,7 +6,7 @@
*
* @example
* // Prompt-specific schemas:
- * import { ParamPromptName } from "../features/prompts/validation";
+ * import { ParamPromptName } from "../server/prompts/validation";
*
* // Cross-feature schemas:
* import { ParamProjectId, ParamLimit } from "../core/validation";
diff --git a/web/src/features/mcp/features/annotationQueues/index.ts b/web/src/features/mcp/server/annotationQueues/index.ts
similarity index 97%
rename from web/src/features/mcp/features/annotationQueues/index.ts
rename to web/src/features/mcp/server/annotationQueues/index.ts
index 937e5ab030..d7121fb593 100644
--- a/web/src/features/mcp/features/annotationQueues/index.ts
+++ b/web/src/features/mcp/server/annotationQueues/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
createAnnotationQueueAssignmentTool,
handleCreateAnnotationQueueAssignment,
diff --git a/web/src/features/mcp/features/annotationQueues/schema.ts b/web/src/features/mcp/server/annotationQueues/schema.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/schema.ts
rename to web/src/features/mcp/server/annotationQueues/schema.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/createAnnotationQueue.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/createAnnotationQueue.ts
rename to web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/createAnnotationQueueAssignment.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/createAnnotationQueueAssignment.ts
rename to web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/createAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/createAnnotationQueueItem.ts
rename to web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/deleteAnnotationQueueAssignment.ts b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
rename to web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/deleteAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/deleteAnnotationQueueItem.ts
rename to web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/getAnnotationQueue.ts b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/getAnnotationQueue.ts
rename to web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/getAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/getAnnotationQueueItem.ts
rename to web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/index.ts b/web/src/features/mcp/server/annotationQueues/tools/index.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/index.ts
rename to web/src/features/mcp/server/annotationQueues/tools/index.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/listAnnotationQueueItems.ts b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/listAnnotationQueueItems.ts
rename to web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/listAnnotationQueues.ts b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/listAnnotationQueues.ts
rename to web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
diff --git a/web/src/features/mcp/features/annotationQueues/tools/updateAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
similarity index 100%
rename from web/src/features/mcp/features/annotationQueues/tools/updateAnnotationQueueItem.ts
rename to web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
diff --git a/web/src/features/mcp/server/bootstrap.ts b/web/src/features/mcp/server/bootstrap.ts
index 3c9998d0bb..e0ef06993d 100644
--- a/web/src/features/mcp/server/bootstrap.ts
+++ b/web/src/features/mcp/server/bootstrap.ts
@@ -5,28 +5,28 @@
* This file is imported once when the server starts to initialize the tool registry.
*
* To add a new MCP feature:
- * 1. Create feature module in /features/[feature-name]/
+ * 1. Create feature module in /server/[feature-name]/
* 2. Import feature module here
* 3. Call toolRegistry.register(featureModule)
*/
import { toolRegistry, type McpFeatureModule } from "./registry";
-import { promptsFeature } from "../features/prompts";
-import { observationsFeature } from "../features/observations";
-import { annotationQueuesFeature } from "../features/annotationQueues";
-import { commentsFeature } from "../features/comments";
-import { datasetsFeature } from "../features/datasets";
-import { healthFeature } from "../features/health";
-import { scoresFeature } from "../features/scores";
-import { metricsFeature } from "../features/metrics";
-import { modelsFeature } from "../features/models";
-import { mediaFeature } from "../features/media";
-import { evalsFeature } from "../features/evals";
-import { dashboardWidgetsFeature } from "../features/dashboardWidgets";
-import { feedbackFeature } from "../features/feedback";
-import { experimentsFeature } from "../features/experiments";
-import { monitorsFeature } from "../features/monitors";
-import { v4MigrationFeature } from "../features/v4Migration";
+import { promptsFeature } from "./prompts";
+import { observationsFeature } from "./observations";
+import { annotationQueuesFeature } from "./annotationQueues";
+import { commentsFeature } from "./comments";
+import { datasetsFeature } from "./datasets";
+import { healthFeature } from "./health";
+import { scoresFeature } from "./scores";
+import { metricsFeature } from "./metrics";
+import { modelsFeature } from "./models";
+import { mediaFeature } from "./media";
+import { evalsFeature } from "./evals";
+import { dashboardWidgetsFeature } from "./dashboardWidgets";
+import { feedbackFeature } from "./feedback";
+import { experimentsFeature } from "./experiments";
+import { monitorsFeature } from "./monitors";
+import { v4MigrationFeature } from "./v4Migration";
const MCP_FEATURES = [
promptsFeature,
diff --git a/web/src/features/mcp/features/comments/index.ts b/web/src/features/mcp/server/comments/index.ts
similarity index 90%
rename from web/src/features/mcp/features/comments/index.ts
rename to web/src/features/mcp/server/comments/index.ts
index 909ab3cb11..e28b9e2948 100644
--- a/web/src/features/mcp/features/comments/index.ts
+++ b/web/src/features/mcp/server/comments/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { createCommentTool, handleCreateComment } from "./tools/createComment";
import { getCommentTool, handleGetComment } from "./tools/getComment";
import { handleListComments, listCommentsTool } from "./tools/listComments";
diff --git a/web/src/features/mcp/features/comments/tools/createComment.ts b/web/src/features/mcp/server/comments/tools/createComment.ts
similarity index 100%
rename from web/src/features/mcp/features/comments/tools/createComment.ts
rename to web/src/features/mcp/server/comments/tools/createComment.ts
diff --git a/web/src/features/mcp/features/comments/tools/getComment.ts b/web/src/features/mcp/server/comments/tools/getComment.ts
similarity index 100%
rename from web/src/features/mcp/features/comments/tools/getComment.ts
rename to web/src/features/mcp/server/comments/tools/getComment.ts
diff --git a/web/src/features/mcp/features/comments/tools/index.ts b/web/src/features/mcp/server/comments/tools/index.ts
similarity index 100%
rename from web/src/features/mcp/features/comments/tools/index.ts
rename to web/src/features/mcp/server/comments/tools/index.ts
diff --git a/web/src/features/mcp/features/comments/tools/listComments.ts b/web/src/features/mcp/server/comments/tools/listComments.ts
similarity index 100%
rename from web/src/features/mcp/features/comments/tools/listComments.ts
rename to web/src/features/mcp/server/comments/tools/listComments.ts
diff --git a/web/src/features/mcp/features/dashboardWidgets/index.ts b/web/src/features/mcp/server/dashboardWidgets/index.ts
similarity index 96%
rename from web/src/features/mcp/features/dashboardWidgets/index.ts
rename to web/src/features/mcp/server/dashboardWidgets/index.ts
index aa70c5ac0d..0be723ec74 100644
--- a/web/src/features/mcp/features/dashboardWidgets/index.ts
+++ b/web/src/features/mcp/server/dashboardWidgets/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
createDashboardWidgetTool,
handleCreateDashboardWidget,
diff --git a/web/src/features/mcp/features/dashboardWidgets/tools/createDashboardWidget.ts b/web/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget.ts
similarity index 100%
rename from web/src/features/mcp/features/dashboardWidgets/tools/createDashboardWidget.ts
rename to web/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget.ts
diff --git a/web/src/features/mcp/features/dashboardWidgets/tools/dashboardCrud.ts b/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
similarity index 99%
rename from web/src/features/mcp/features/dashboardWidgets/tools/dashboardCrud.ts
rename to web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
index 5acdde42d0..2964065c36 100644
--- a/web/src/features/mcp/features/dashboardWidgets/tools/dashboardCrud.ts
+++ b/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
@@ -6,7 +6,7 @@ import { runMcpTool } from "@/src/features/mcp/core/run-mcp-tool";
import {
DashboardWidgetChartConfigBaseSchema,
DashboardWidgetFilterBaseSchema,
-} from "@/src/features/mcp/features/dashboardWidgets/tools/createDashboardWidget";
+} from "@/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget";
import {
buildDashboardUrl,
buildDashboardWidgetUrl,
diff --git a/web/src/features/mcp/features/datasets/events-only-guard.ts b/web/src/features/mcp/server/datasets/events-only-guard.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/events-only-guard.ts
rename to web/src/features/mcp/server/datasets/events-only-guard.ts
diff --git a/web/src/features/mcp/features/datasets/index.ts b/web/src/features/mcp/server/datasets/index.ts
similarity index 97%
rename from web/src/features/mcp/features/datasets/index.ts
rename to web/src/features/mcp/server/datasets/index.ts
index d3f0a5988e..821f2a143c 100644
--- a/web/src/features/mcp/features/datasets/index.ts
+++ b/web/src/features/mcp/server/datasets/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { upsertDatasetTool, handleUpsertDataset } from "./tools/upsertDataset";
import {
upsertDatasetItemTool,
diff --git a/web/src/features/mcp/features/datasets/schema.ts b/web/src/features/mcp/server/datasets/schema.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/schema.ts
rename to web/src/features/mcp/server/datasets/schema.ts
diff --git a/web/src/features/mcp/features/datasets/tools/createDatasetRunItem.ts b/web/src/features/mcp/server/datasets/tools/createDatasetRunItem.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/createDatasetRunItem.ts
rename to web/src/features/mcp/server/datasets/tools/createDatasetRunItem.ts
diff --git a/web/src/features/mcp/features/datasets/tools/deleteDatasetItem.ts b/web/src/features/mcp/server/datasets/tools/deleteDatasetItem.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/deleteDatasetItem.ts
rename to web/src/features/mcp/server/datasets/tools/deleteDatasetItem.ts
diff --git a/web/src/features/mcp/features/datasets/tools/deleteDatasetRun.ts b/web/src/features/mcp/server/datasets/tools/deleteDatasetRun.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/deleteDatasetRun.ts
rename to web/src/features/mcp/server/datasets/tools/deleteDatasetRun.ts
diff --git a/web/src/features/mcp/features/datasets/tools/getDataset.ts b/web/src/features/mcp/server/datasets/tools/getDataset.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/getDataset.ts
rename to web/src/features/mcp/server/datasets/tools/getDataset.ts
diff --git a/web/src/features/mcp/features/datasets/tools/getDatasetItem.ts b/web/src/features/mcp/server/datasets/tools/getDatasetItem.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/getDatasetItem.ts
rename to web/src/features/mcp/server/datasets/tools/getDatasetItem.ts
diff --git a/web/src/features/mcp/features/datasets/tools/getDatasetRun.ts b/web/src/features/mcp/server/datasets/tools/getDatasetRun.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/getDatasetRun.ts
rename to web/src/features/mcp/server/datasets/tools/getDatasetRun.ts
diff --git a/web/src/features/mcp/features/datasets/tools/index.ts b/web/src/features/mcp/server/datasets/tools/index.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/index.ts
rename to web/src/features/mcp/server/datasets/tools/index.ts
diff --git a/web/src/features/mcp/features/datasets/tools/listDatasetItems.ts b/web/src/features/mcp/server/datasets/tools/listDatasetItems.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/listDatasetItems.ts
rename to web/src/features/mcp/server/datasets/tools/listDatasetItems.ts
diff --git a/web/src/features/mcp/features/datasets/tools/listDatasetRunItems.ts b/web/src/features/mcp/server/datasets/tools/listDatasetRunItems.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/listDatasetRunItems.ts
rename to web/src/features/mcp/server/datasets/tools/listDatasetRunItems.ts
diff --git a/web/src/features/mcp/features/datasets/tools/listDatasetRuns.ts b/web/src/features/mcp/server/datasets/tools/listDatasetRuns.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/listDatasetRuns.ts
rename to web/src/features/mcp/server/datasets/tools/listDatasetRuns.ts
diff --git a/web/src/features/mcp/features/datasets/tools/listDatasets.ts b/web/src/features/mcp/server/datasets/tools/listDatasets.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/listDatasets.ts
rename to web/src/features/mcp/server/datasets/tools/listDatasets.ts
diff --git a/web/src/features/mcp/features/datasets/tools/upsertDataset.ts b/web/src/features/mcp/server/datasets/tools/upsertDataset.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/upsertDataset.ts
rename to web/src/features/mcp/server/datasets/tools/upsertDataset.ts
diff --git a/web/src/features/mcp/features/datasets/tools/upsertDatasetItem.ts b/web/src/features/mcp/server/datasets/tools/upsertDatasetItem.ts
similarity index 100%
rename from web/src/features/mcp/features/datasets/tools/upsertDatasetItem.ts
rename to web/src/features/mcp/server/datasets/tools/upsertDatasetItem.ts
diff --git a/web/src/features/mcp/features/evals/evaluator-service.ts b/web/src/features/mcp/server/evals/evaluator-service.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/evaluator-service.ts
rename to web/src/features/mcp/server/evals/evaluator-service.ts
diff --git a/web/src/features/mcp/features/evals/index.ts b/web/src/features/mcp/server/evals/index.ts
similarity index 97%
rename from web/src/features/mcp/features/evals/index.ts
rename to web/src/features/mcp/server/evals/index.ts
index 505261263b..a61531fbec 100644
--- a/web/src/features/mcp/features/evals/index.ts
+++ b/web/src/features/mcp/server/evals/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
listEvaluatorsTool,
handleListEvaluators,
diff --git a/web/src/features/mcp/features/evals/rule-schema.ts b/web/src/features/mcp/server/evals/rule-schema.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/rule-schema.ts
rename to web/src/features/mcp/server/evals/rule-schema.ts
diff --git a/web/src/features/mcp/features/evals/rule-service.ts b/web/src/features/mcp/server/evals/rule-service.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/rule-service.ts
rename to web/src/features/mcp/server/evals/rule-service.ts
diff --git a/web/src/features/mcp/features/evals/tools/createEvaluationRule.ts b/web/src/features/mcp/server/evals/tools/createEvaluationRule.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/createEvaluationRule.ts
rename to web/src/features/mcp/server/evals/tools/createEvaluationRule.ts
diff --git a/web/src/features/mcp/features/evals/tools/createEvaluator.ts b/web/src/features/mcp/server/evals/tools/createEvaluator.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/createEvaluator.ts
rename to web/src/features/mcp/server/evals/tools/createEvaluator.ts
diff --git a/web/src/features/mcp/features/evals/tools/deleteEvaluationRule.ts b/web/src/features/mcp/server/evals/tools/deleteEvaluationRule.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/deleteEvaluationRule.ts
rename to web/src/features/mcp/server/evals/tools/deleteEvaluationRule.ts
diff --git a/web/src/features/mcp/features/evals/tools/deleteEvaluator.ts b/web/src/features/mcp/server/evals/tools/deleteEvaluator.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/deleteEvaluator.ts
rename to web/src/features/mcp/server/evals/tools/deleteEvaluator.ts
diff --git a/web/src/features/mcp/features/evals/tools/evaluatorInput.ts b/web/src/features/mcp/server/evals/tools/evaluatorInput.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/evaluatorInput.ts
rename to web/src/features/mcp/server/evals/tools/evaluatorInput.ts
diff --git a/web/src/features/mcp/features/evals/tools/getEvaluationRule.ts b/web/src/features/mcp/server/evals/tools/getEvaluationRule.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/getEvaluationRule.ts
rename to web/src/features/mcp/server/evals/tools/getEvaluationRule.ts
diff --git a/web/src/features/mcp/features/evals/tools/getEvaluator.ts b/web/src/features/mcp/server/evals/tools/getEvaluator.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/getEvaluator.ts
rename to web/src/features/mcp/server/evals/tools/getEvaluator.ts
diff --git a/web/src/features/mcp/features/evals/tools/listEvaluationRules.ts b/web/src/features/mcp/server/evals/tools/listEvaluationRules.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/listEvaluationRules.ts
rename to web/src/features/mcp/server/evals/tools/listEvaluationRules.ts
diff --git a/web/src/features/mcp/features/evals/tools/listEvaluators.ts b/web/src/features/mcp/server/evals/tools/listEvaluators.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/listEvaluators.ts
rename to web/src/features/mcp/server/evals/tools/listEvaluators.ts
diff --git a/web/src/features/mcp/features/evals/tools/listManagedEvaluatorTemplates.ts b/web/src/features/mcp/server/evals/tools/listManagedEvaluatorTemplates.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/listManagedEvaluatorTemplates.ts
rename to web/src/features/mcp/server/evals/tools/listManagedEvaluatorTemplates.ts
diff --git a/web/src/features/mcp/features/evals/tools/manageEvaluationRuleEvaluators.ts b/web/src/features/mcp/server/evals/tools/manageEvaluationRuleEvaluators.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/manageEvaluationRuleEvaluators.ts
rename to web/src/features/mcp/server/evals/tools/manageEvaluationRuleEvaluators.ts
diff --git a/web/src/features/mcp/features/evals/tools/updateEvaluationRule.ts b/web/src/features/mcp/server/evals/tools/updateEvaluationRule.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/updateEvaluationRule.ts
rename to web/src/features/mcp/server/evals/tools/updateEvaluationRule.ts
diff --git a/web/src/features/mcp/features/evals/tools/updateEvaluator.ts b/web/src/features/mcp/server/evals/tools/updateEvaluator.ts
similarity index 100%
rename from web/src/features/mcp/features/evals/tools/updateEvaluator.ts
rename to web/src/features/mcp/server/evals/tools/updateEvaluator.ts
diff --git a/web/src/features/mcp/features/experiments/index.ts b/web/src/features/mcp/server/experiments/index.ts
similarity index 90%
rename from web/src/features/mcp/features/experiments/index.ts
rename to web/src/features/mcp/server/experiments/index.ts
index fd3462554f..3700976af6 100644
--- a/web/src/features/mcp/features/experiments/index.ts
+++ b/web/src/features/mcp/server/experiments/index.ts
@@ -1,5 +1,5 @@
import { env } from "@/src/env.mjs";
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
handleListExperimentItems,
handleListExperiments,
diff --git a/web/src/features/mcp/features/experiments/schema.ts b/web/src/features/mcp/server/experiments/schema.ts
similarity index 100%
rename from web/src/features/mcp/features/experiments/schema.ts
rename to web/src/features/mcp/server/experiments/schema.ts
diff --git a/web/src/features/mcp/features/experiments/tools/index.ts b/web/src/features/mcp/server/experiments/tools/index.ts
similarity index 100%
rename from web/src/features/mcp/features/experiments/tools/index.ts
rename to web/src/features/mcp/server/experiments/tools/index.ts
diff --git a/web/src/features/mcp/features/experiments/tools/listExperimentItems.ts b/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
similarity index 100%
rename from web/src/features/mcp/features/experiments/tools/listExperimentItems.ts
rename to web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
diff --git a/web/src/features/mcp/features/experiments/tools/listExperiments.ts b/web/src/features/mcp/server/experiments/tools/listExperiments.ts
similarity index 100%
rename from web/src/features/mcp/features/experiments/tools/listExperiments.ts
rename to web/src/features/mcp/server/experiments/tools/listExperiments.ts
diff --git a/web/src/features/mcp/features/feedback/index.ts b/web/src/features/mcp/server/feedback/index.ts
similarity index 89%
rename from web/src/features/mcp/features/feedback/index.ts
rename to web/src/features/mcp/server/feedback/index.ts
index 98fa784508..d9835075d4 100644
--- a/web/src/features/mcp/features/feedback/index.ts
+++ b/web/src/features/mcp/server/feedback/index.ts
@@ -1,5 +1,5 @@
import { isProductFeedbackAvailable } from "@/src/features/feedback/server/FeedbackService";
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
handleSubmitFeedback,
submitFeedbackTool,
diff --git a/web/src/features/mcp/features/feedback/tools/submitFeedback.ts b/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
similarity index 100%
rename from web/src/features/mcp/features/feedback/tools/submitFeedback.ts
rename to web/src/features/mcp/server/feedback/tools/submitFeedback.ts
diff --git a/web/src/features/mcp/features/health/index.ts b/web/src/features/mcp/server/health/index.ts
similarity index 82%
rename from web/src/features/mcp/features/health/index.ts
rename to web/src/features/mcp/server/health/index.ts
index 7b83afeac4..152a49d580 100644
--- a/web/src/features/mcp/features/health/index.ts
+++ b/web/src/features/mcp/server/health/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { getHealthTool, handleGetHealth } from "./tools/getHealth";
export const healthFeature = {
diff --git a/web/src/features/mcp/features/health/tools/getHealth.ts b/web/src/features/mcp/server/health/tools/getHealth.ts
similarity index 100%
rename from web/src/features/mcp/features/health/tools/getHealth.ts
rename to web/src/features/mcp/server/health/tools/getHealth.ts
diff --git a/web/src/features/mcp/features/health/tools/index.ts b/web/src/features/mcp/server/health/tools/index.ts
similarity index 100%
rename from web/src/features/mcp/features/health/tools/index.ts
rename to web/src/features/mcp/server/health/tools/index.ts
diff --git a/web/src/features/mcp/features/media/index.ts b/web/src/features/mcp/server/media/index.ts
similarity index 85%
rename from web/src/features/mcp/features/media/index.ts
rename to web/src/features/mcp/server/media/index.ts
index 50b04aca29..f57db5bbe5 100644
--- a/web/src/features/mcp/features/media/index.ts
+++ b/web/src/features/mcp/server/media/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { getMediaTool, handleGetMedia } from "./tools/getMedia";
export const mediaFeature = {
diff --git a/web/src/features/mcp/features/media/tools/getMedia.ts b/web/src/features/mcp/server/media/tools/getMedia.ts
similarity index 100%
rename from web/src/features/mcp/features/media/tools/getMedia.ts
rename to web/src/features/mcp/server/media/tools/getMedia.ts
diff --git a/web/src/features/mcp/features/metrics/index.ts b/web/src/features/mcp/server/metrics/index.ts
similarity index 91%
rename from web/src/features/mcp/features/metrics/index.ts
rename to web/src/features/mcp/server/metrics/index.ts
index 8c23d2ef7e..b3282ee402 100644
--- a/web/src/features/mcp/features/metrics/index.ts
+++ b/web/src/features/mcp/server/metrics/index.ts
@@ -1,5 +1,5 @@
import { env } from "@/src/env.mjs";
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
getMetricsSchemaTool,
handleGetMetricsSchema,
diff --git a/web/src/features/mcp/features/metrics/tools/getMetricsSchema.ts b/web/src/features/mcp/server/metrics/tools/getMetricsSchema.ts
similarity index 100%
rename from web/src/features/mcp/features/metrics/tools/getMetricsSchema.ts
rename to web/src/features/mcp/server/metrics/tools/getMetricsSchema.ts
diff --git a/web/src/features/mcp/features/metrics/tools/queryMetrics.ts b/web/src/features/mcp/server/metrics/tools/queryMetrics.ts
similarity index 100%
rename from web/src/features/mcp/features/metrics/tools/queryMetrics.ts
rename to web/src/features/mcp/server/metrics/tools/queryMetrics.ts
diff --git a/web/src/features/mcp/features/models/index.ts b/web/src/features/mcp/server/models/index.ts
similarity index 91%
rename from web/src/features/mcp/features/models/index.ts
rename to web/src/features/mcp/server/models/index.ts
index 69f359dd2d..a0f4f99b00 100644
--- a/web/src/features/mcp/features/models/index.ts
+++ b/web/src/features/mcp/server/models/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { createModelTool, handleCreateModel } from "./tools/createModel";
import { deleteModelTool, handleDeleteModel } from "./tools/deleteModel";
import { getModelTool, handleGetModel } from "./tools/getModel";
diff --git a/web/src/features/mcp/features/models/tools/createModel.ts b/web/src/features/mcp/server/models/tools/createModel.ts
similarity index 100%
rename from web/src/features/mcp/features/models/tools/createModel.ts
rename to web/src/features/mcp/server/models/tools/createModel.ts
diff --git a/web/src/features/mcp/features/models/tools/deleteModel.ts b/web/src/features/mcp/server/models/tools/deleteModel.ts
similarity index 100%
rename from web/src/features/mcp/features/models/tools/deleteModel.ts
rename to web/src/features/mcp/server/models/tools/deleteModel.ts
diff --git a/web/src/features/mcp/features/models/tools/getModel.ts b/web/src/features/mcp/server/models/tools/getModel.ts
similarity index 100%
rename from web/src/features/mcp/features/models/tools/getModel.ts
rename to web/src/features/mcp/server/models/tools/getModel.ts
diff --git a/web/src/features/mcp/features/models/tools/index.ts b/web/src/features/mcp/server/models/tools/index.ts
similarity index 100%
rename from web/src/features/mcp/features/models/tools/index.ts
rename to web/src/features/mcp/server/models/tools/index.ts
diff --git a/web/src/features/mcp/features/models/tools/listModels.ts b/web/src/features/mcp/server/models/tools/listModels.ts
similarity index 100%
rename from web/src/features/mcp/features/models/tools/listModels.ts
rename to web/src/features/mcp/server/models/tools/listModels.ts
diff --git a/web/src/features/mcp/features/monitors/index.ts b/web/src/features/mcp/server/monitors/index.ts
similarity index 89%
rename from web/src/features/mcp/features/monitors/index.ts
rename to web/src/features/mcp/server/monitors/index.ts
index ed8d1541c2..3890c694d7 100644
--- a/web/src/features/mcp/features/monitors/index.ts
+++ b/web/src/features/mcp/server/monitors/index.ts
@@ -1,6 +1,6 @@
import { env } from "@/src/env.mjs";
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { getMonitorTool, handleGetMonitor } from "./tools/getMonitor";
import { listMonitorsTool, handleListMonitors } from "./tools/listMonitors";
diff --git a/web/src/features/mcp/features/monitors/tools/getMonitor.ts b/web/src/features/mcp/server/monitors/tools/getMonitor.ts
similarity index 100%
rename from web/src/features/mcp/features/monitors/tools/getMonitor.ts
rename to web/src/features/mcp/server/monitors/tools/getMonitor.ts
diff --git a/web/src/features/mcp/features/monitors/tools/listMonitors.ts b/web/src/features/mcp/server/monitors/tools/listMonitors.ts
similarity index 100%
rename from web/src/features/mcp/features/monitors/tools/listMonitors.ts
rename to web/src/features/mcp/server/monitors/tools/listMonitors.ts
diff --git a/web/src/features/mcp/features/observations/index.ts b/web/src/features/mcp/server/observations/index.ts
similarity index 95%
rename from web/src/features/mcp/features/observations/index.ts
rename to web/src/features/mcp/server/observations/index.ts
index ef03f3ba1c..aef11c401e 100644
--- a/web/src/features/mcp/features/observations/index.ts
+++ b/web/src/features/mcp/server/observations/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
getObservationTool,
handleGetObservation,
diff --git a/web/src/features/mcp/features/observations/schema.ts b/web/src/features/mcp/server/observations/schema.ts
similarity index 100%
rename from web/src/features/mcp/features/observations/schema.ts
rename to web/src/features/mcp/server/observations/schema.ts
diff --git a/web/src/features/mcp/features/observations/tools/getObservation.ts b/web/src/features/mcp/server/observations/tools/getObservation.ts
similarity index 100%
rename from web/src/features/mcp/features/observations/tools/getObservation.ts
rename to web/src/features/mcp/server/observations/tools/getObservation.ts
diff --git a/web/src/features/mcp/features/observations/tools/getObservationFieldSchema.ts b/web/src/features/mcp/server/observations/tools/getObservationFieldSchema.ts
similarity index 100%
rename from web/src/features/mcp/features/observations/tools/getObservationFieldSchema.ts
rename to web/src/features/mcp/server/observations/tools/getObservationFieldSchema.ts
diff --git a/web/src/features/mcp/features/observations/tools/getObservationFilterSchema.ts b/web/src/features/mcp/server/observations/tools/getObservationFilterSchema.ts
similarity index 100%
rename from web/src/features/mcp/features/observations/tools/getObservationFilterSchema.ts
rename to web/src/features/mcp/server/observations/tools/getObservationFilterSchema.ts
diff --git a/web/src/features/mcp/features/observations/tools/getObservationFilterValues.ts b/web/src/features/mcp/server/observations/tools/getObservationFilterValues.ts
similarity index 100%
rename from web/src/features/mcp/features/observations/tools/getObservationFilterValues.ts
rename to web/src/features/mcp/server/observations/tools/getObservationFilterValues.ts
diff --git a/web/src/features/mcp/features/observations/tools/listObservations.ts b/web/src/features/mcp/server/observations/tools/listObservations.ts
similarity index 100%
rename from web/src/features/mcp/features/observations/tools/listObservations.ts
rename to web/src/features/mcp/server/observations/tools/listObservations.ts
diff --git a/web/src/features/mcp/features/prompts/index.ts b/web/src/features/mcp/server/prompts/index.ts
similarity index 97%
rename from web/src/features/mcp/features/prompts/index.ts
rename to web/src/features/mcp/server/prompts/index.ts
index 7088f9fe44..3a30025fe8 100644
--- a/web/src/features/mcp/features/prompts/index.ts
+++ b/web/src/features/mcp/server/prompts/index.ts
@@ -13,7 +13,7 @@
* - updatePromptLabels: Update labels on prompt versions (destructive)
*/
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { getPromptTool, handleGetPrompt } from "./tools/getPrompt";
import {
getPromptUnresolvedTool,
diff --git a/web/src/features/mcp/features/prompts/tools/createChatPrompt.ts b/web/src/features/mcp/server/prompts/tools/createChatPrompt.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/createChatPrompt.ts
rename to web/src/features/mcp/server/prompts/tools/createChatPrompt.ts
diff --git a/web/src/features/mcp/features/prompts/tools/createTextPrompt.ts b/web/src/features/mcp/server/prompts/tools/createTextPrompt.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/createTextPrompt.ts
rename to web/src/features/mcp/server/prompts/tools/createTextPrompt.ts
diff --git a/web/src/features/mcp/features/prompts/tools/getPrompt.ts b/web/src/features/mcp/server/prompts/tools/getPrompt.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/getPrompt.ts
rename to web/src/features/mcp/server/prompts/tools/getPrompt.ts
diff --git a/web/src/features/mcp/features/prompts/tools/getPromptUnresolved.ts b/web/src/features/mcp/server/prompts/tools/getPromptUnresolved.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/getPromptUnresolved.ts
rename to web/src/features/mcp/server/prompts/tools/getPromptUnresolved.ts
diff --git a/web/src/features/mcp/features/prompts/tools/listPrompts.ts b/web/src/features/mcp/server/prompts/tools/listPrompts.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/listPrompts.ts
rename to web/src/features/mcp/server/prompts/tools/listPrompts.ts
diff --git a/web/src/features/mcp/features/prompts/tools/promptReadToolFactory.ts b/web/src/features/mcp/server/prompts/tools/promptReadToolFactory.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/promptReadToolFactory.ts
rename to web/src/features/mcp/server/prompts/tools/promptReadToolFactory.ts
diff --git a/web/src/features/mcp/features/prompts/tools/updatePromptLabels.ts b/web/src/features/mcp/server/prompts/tools/updatePromptLabels.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/tools/updatePromptLabels.ts
rename to web/src/features/mcp/server/prompts/tools/updatePromptLabels.ts
diff --git a/web/src/features/mcp/features/prompts/validation.ts b/web/src/features/mcp/server/prompts/validation.ts
similarity index 100%
rename from web/src/features/mcp/features/prompts/validation.ts
rename to web/src/features/mcp/server/prompts/validation.ts
diff --git a/web/src/features/mcp/features/publicApi.ts b/web/src/features/mcp/server/publicApi.ts
similarity index 100%
rename from web/src/features/mcp/features/publicApi.ts
rename to web/src/features/mcp/server/publicApi.ts
diff --git a/web/src/features/mcp/features/scores/index.ts b/web/src/features/mcp/server/scores/index.ts
similarity index 96%
rename from web/src/features/mcp/features/scores/index.ts
rename to web/src/features/mcp/server/scores/index.ts
index 04741b5b4c..bfee906ca2 100644
--- a/web/src/features/mcp/features/scores/index.ts
+++ b/web/src/features/mcp/server/scores/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import { getScoreTool, handleGetScore } from "./tools/getScore";
import {
getScoreConfigTool,
diff --git a/web/src/features/mcp/features/scores/schema.ts b/web/src/features/mcp/server/scores/schema.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/schema.ts
rename to web/src/features/mcp/server/scores/schema.ts
diff --git a/web/src/features/mcp/features/scores/tools/createScore.ts b/web/src/features/mcp/server/scores/tools/createScore.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/createScore.ts
rename to web/src/features/mcp/server/scores/tools/createScore.ts
diff --git a/web/src/features/mcp/features/scores/tools/createScoreConfig.ts b/web/src/features/mcp/server/scores/tools/createScoreConfig.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/createScoreConfig.ts
rename to web/src/features/mcp/server/scores/tools/createScoreConfig.ts
diff --git a/web/src/features/mcp/features/scores/tools/deleteScoreConfig.ts b/web/src/features/mcp/server/scores/tools/deleteScoreConfig.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/deleteScoreConfig.ts
rename to web/src/features/mcp/server/scores/tools/deleteScoreConfig.ts
diff --git a/web/src/features/mcp/features/scores/tools/getScore.ts b/web/src/features/mcp/server/scores/tools/getScore.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/getScore.ts
rename to web/src/features/mcp/server/scores/tools/getScore.ts
diff --git a/web/src/features/mcp/features/scores/tools/getScoreConfig.ts b/web/src/features/mcp/server/scores/tools/getScoreConfig.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/getScoreConfig.ts
rename to web/src/features/mcp/server/scores/tools/getScoreConfig.ts
diff --git a/web/src/features/mcp/features/scores/tools/listScoreConfigs.ts b/web/src/features/mcp/server/scores/tools/listScoreConfigs.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/listScoreConfigs.ts
rename to web/src/features/mcp/server/scores/tools/listScoreConfigs.ts
diff --git a/web/src/features/mcp/features/scores/tools/listScores.ts b/web/src/features/mcp/server/scores/tools/listScores.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/listScores.ts
rename to web/src/features/mcp/server/scores/tools/listScores.ts
diff --git a/web/src/features/mcp/features/scores/tools/updateScoreConfig.ts b/web/src/features/mcp/server/scores/tools/updateScoreConfig.ts
similarity index 100%
rename from web/src/features/mcp/features/scores/tools/updateScoreConfig.ts
rename to web/src/features/mcp/server/scores/tools/updateScoreConfig.ts
diff --git a/web/src/features/mcp/features/v4Migration/index.ts b/web/src/features/mcp/server/v4Migration/index.ts
similarity index 85%
rename from web/src/features/mcp/features/v4Migration/index.ts
rename to web/src/features/mcp/server/v4Migration/index.ts
index 18ecc1bb97..1835b20e92 100644
--- a/web/src/features/mcp/features/v4Migration/index.ts
+++ b/web/src/features/mcp/server/v4Migration/index.ts
@@ -1,4 +1,4 @@
-import type { McpFeatureModule } from "../../server/registry";
+import type { McpFeatureModule } from "../registry";
import {
getV4MigrationDataTool,
handleGetV4MigrationData,
diff --git a/web/src/features/mcp/features/v4Migration/tools/getV4MigrationData.ts b/web/src/features/mcp/server/v4Migration/tools/getV4MigrationData.ts
similarity index 100%
rename from web/src/features/mcp/features/v4Migration/tools/getV4MigrationData.ts
rename to web/src/features/mcp/server/v4Migration/tools/getV4MigrationData.ts