fix: remove awkward agent auto-duplication logic for collaborative sharing

- Remove auto-duplication when non-authors edit collaborative global agents
- Allow direct editing of collaborative agents as intended
- Remove originalAgentId field from schema and types
- Simplify getListAgents by removing duplicate filtering logic
- Clean up filterOutMCPTools function and references
- Preserve MCP tools in manually duplicated agents

This fixes collaborative agent editing and prepares for clean group sharing implementation.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: MichielMAnalytics

api/models/Agent.js

@@ -425,13 +425,6 @@ const getListAgents = async (searchParameter) => {
     query = { $or: [globalQuery, query] };
   }
 
-  // Get user's duplicated agent original IDs to filter them out from global agents
-  const userDuplicates = await Agent.find(
-    { author, originalAgentId: { $exists: true, $ne: null } },
-    { originalAgentId: 1, _id: 0 },
-  ).lean();
-
-  const duplicatedOriginalIds = userDuplicates.map((agent) => agent.originalAgentId);
   const agents = (
     await Agent.find(query, {
       id: 1,
@@ -442,28 +435,17 @@ const getListAgents = async (searchParameter) => {
       projectIds: 1,
       description: 1,
       isCollaborative: 1,
-      originalAgentId: 1,
       tools: 1,
     }).lean()
-  )
-    .filter((agent) => {
-      // Filter out original shared agents if user has duplicated them
-      if (agent.author?.toString() !== author && duplicatedOriginalIds.includes(agent.id)) {
-        return false;
-      }
-      return true;
-    })
-    .map((agent) => {
-      if (agent.author?.toString() !== author) {
-        delete agent.author;
-      }
-      if (agent.author) {
-        agent.author = agent.author.toString();
-      }
-      // Don't expose originalAgentId in the response
-      delete agent.originalAgentId;
-      return agent;
-    });
+  ).map((agent) => {
+    if (agent.author?.toString() !== author) {
+      delete agent.author;
+    }
+    if (agent.author) {
+      agent.author = agent.author.toString();
+    }
+    return agent;
+  });
 
   const hasMore = agents.length > 0;
   const firstId = agents.length > 0 ? agents[0].id : null;

api/server/controllers/agents/v1.js

@@ -172,28 +172,6 @@ const enhanceToolsWithMCPMetadata = (tools, availableTools = {}) => {
   return enhancedTools;
 };
 
-/**
- * Filter out MCP tools from enhanced tools array for agent duplication security
- * @param {Array<string | Object>} tools - Enhanced tools array
- * @returns {Array<string>} Array of non-MCP tools only
- */
-const filterOutMCPTools = (tools) => {
-  if (!Array.isArray(tools)) {
-    return [];
-  }
-
-  const nonMCPTools = [];
-
-  for (const tool of tools) {
-    if (typeof tool === 'string') {
-      // Keep regular/system tools
-      nonMCPTools.push(tool);
-    }
-    // Skip MCP tool objects (they have tool/server/type properties)
-  }
-
-  return nonMCPTools;
-};
 
 /**
  * Creates an Agent.
@@ -383,137 +361,6 @@ const updateAgentHandler = async (req, res) => {
       return res.status(404).json({ error: 'Agent not found' });
     }
 
-    // Check if this is a global agent that should be cloned instead of modified
-    const globalProject = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, 'agentIds');
-    const isGlobalAgent = globalProject && (globalProject.agentIds?.includes(id) ?? false);
-    const shouldCloneInsteadOfUpdate =
-      isGlobalAgent && existingAgent.isCollaborative && !isAuthor && !isAdmin;
-
-    if (shouldCloneInsteadOfUpdate) {
-      // Instead of updating the global agent, create a duplicate for the user
-      const {
-        id: _id,
-        _id: __id,
-        author: _author,
-        createdAt: _createdAt,
-        updatedAt: _updatedAt,
-        tool_resources: _tool_resources = {},
-        ...cloneData
-      } = existingAgent;
-
-      // Apply the updates to the clone data
-      Object.assign(cloneData, updateData);
-
-      // Remove MCP tools from duplicated agents so users need to connect their own integrations
-      if (cloneData.tools && Array.isArray(cloneData.tools)) {
-        const originalToolCount = cloneData.tools.length;
-        const { ToolMetadataUtils } = require('librechat-data-provider');
-        const availableTools = req.app.locals.availableTools || {};
-
-        const mcpTools = cloneData.tools.filter((tool) => {
-          if (typeof tool === 'string') {
-            const toolDef = availableTools[tool];
-            return toolDef && ToolMetadataUtils.isMCPTool(toolDef);
-          }
-          return false;
-        });
-
-        cloneData.tools = cloneData.tools.filter((tool) => {
-          if (typeof tool === 'string') {
-            // Check if this is an MCP tool using embedded metadata
-            const toolDef = availableTools[tool];
-            return !(toolDef && ToolMetadataUtils.isMCPTool(toolDef));
-          }
-          return true;
-        });
-
-        if (mcpTools.length > 0) {
-          logger.info(
-            `[/agents/:id] Removed ${mcpTools.length} MCP tools during auto-duplication for user ${req.user.id}. User can add their own integrations. Tools removed: ${mcpTools.join(', ')}`,
-          );
-        }
-
-        logger.info(
-          `[/agents/:id] Tool count: ${originalToolCount} -> ${cloneData.tools.length} (removed ${originalToolCount - cloneData.tools.length} MCP tools)`,
-        );
-      }
-
-      if (_tool_resources?.[EToolResources.ocr]) {
-        cloneData.tool_resources = {
-          [EToolResources.ocr]: _tool_resources[EToolResources.ocr],
-        };
-      }
-
-      const newAgentId = `agent_${nanoid()}`;
-      const newAgentData = Object.assign(cloneData, {
-        id: newAgentId,
-        author: req.user.id,
-        originalAgentId: id,
-        projectIds: [], // Clear project associations - duplicated agents should be private
-        isCollaborative: false, // Make the private copy non-collaborative
-        tools: filterOutMCPTools(originalAgent.tools), // Clear MCP tools for duplicated agents - users need to connect their own integrations
-      });
-
-      // Handle actions duplication if the original agent has actions
-      const newActionsList = [];
-      const originalActions = (await getActions({ agent_id: id }, true)) ?? [];
-      const sensitiveFields = ['api_key', 'oauth_client_id', 'oauth_client_secret'];
-      const promises = [];
-
-      /**
-       * Duplicates an action and returns the new action ID.
-       * @param {Action} action
-       * @returns {Promise<string>}
-       */
-      const duplicateAction = async (action) => {
-        const newActionId = nanoid();
-        const [domain] = action.action_id.split(actionDelimiter);
-        const fullActionId = `${domain}${actionDelimiter}${newActionId}`;
-
-        const newAction = await updateAction(
-          { action_id: newActionId },
-          {
-            metadata: action.metadata,
-            agent_id: newAgentId,
-            user: req.user.id,
-          },
-        );
-
-        const filteredMetadata = { ...newAction.metadata };
-        for (const field of sensitiveFields) {
-          delete filteredMetadata[field];
-        }
-
-        newAction.metadata = filteredMetadata;
-        newActionsList.push(newAction);
-        return fullActionId;
-      };
-
-      for (const action of originalActions) {
-        promises.push(
-          duplicateAction(action).catch((error) => {
-            logger.error('[/agents/:id] Error duplicating Action during auto-duplication:', error);
-          }),
-        );
-      }
-
-      const agentActions = await Promise.all(promises);
-      newAgentData.actions = agentActions;
-
-      const newAgent = await createAgent(newAgentData);
-
-      logger.info(
-        `[/agents/:id] Auto-duplicated global agent ${id} to ${newAgentId} for user ${req.user.id} due to modification attempt`,
-      );
-
-      return res.status(201).json({
-        ...newAgent,
-        actions: newActionsList,
-        message: 'Global agent duplicated as your private copy with modifications',
-        duplicated: true,
-        originalAgentId: id,
-      });
-    }
 
     const hasEditPermission = existingAgent.isCollaborative || isAdmin || isAuthor;
 
@@ -643,9 +490,7 @@ const duplicateAgentHandler = async (req, res) => {
     const newAgentData = Object.assign(cloneData, {
       id: newAgentId,
       author: userId,
-      originalAgentId: id,
       projectIds: [], // Clear project associations - duplicated agents should be private
-      tools: filterOutMCPTools(cloneData.tools), // Clear MCP tools for duplicated agents - users need to connect their own integrations
     });
 
     const newActionsList = [];

packages/data-schemas/src/schema/agent.ts

@@ -92,9 +92,6 @@ const agentSchema = new Schema<IAgent>(
       ref: 'Project',
       index: true,
     },
-    originalAgentId: {
-      type: String,
-    },
     versions: {
       type: [Schema.Types.Mixed],
       default: [],

packages/data-schemas/src/types/agent.ts

@@ -34,6 +34,5 @@ export interface IAgent extends Omit<Document, 'model'> {
   default_prompts?: string[];
   tool_resources?: unknown;
   projectIds?: Types.ObjectId[];
-  originalAgentId?: string;
   versions?: Omit<IAgent, 'versions'>[];
 }