motionmcp 2.1.1 → 2.2.1

package/dist/services/motionApi.js

@@ -36,10 +36,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MotionApiService = void 0;
 const axios_1 = __importStar(require("axios"));
 const constants_1 = require("../utils/constants");
+const frequencyTransform_1 = require("../utils/frequencyTransform");
 const logger_1 = require("../utils/logger");
 const cache_1 = require("../utils/cache");
 const paginationNew_1 = require("../utils/paginationNew");
 const responseWrapper_1 = require("../utils/responseWrapper");
+const userFacingErrors_1 = require("../utils/userFacingErrors");
 const zod_1 = require("zod");
 const motion_1 = require("../schemas/motion");
 // Note: Using native axios.isAxiosError instead of custom implementation
@@ -66,7 +68,7 @@ class MotionApiService {
             if (error instanceof zod_1.z.ZodError) {
                 const errorDetails = {
                     context,
-                    validationErrors: error.errors,
+                    validationErrors: error.issues,
                     ...(motion_1.VALIDATION_CONFIG.includeDataInLogs ? { receivedData: data } : {})
                 };
                 if (motion_1.VALIDATION_CONFIG.logErrors) {
@@ -101,7 +103,8 @@ class MotionApiService {
             headers: {
                 'X-API-Key': this.apiKey,
                 'Content-Type': 'application/json'
-            }
+            },
+            timeout: constants_1.API_CONFIG.TIMEOUT_MS
         });
         // Initialize cache instances with TTL from constants (converted to ms)
         this.workspaceCache = new cache_1.SimpleCache(constants_1.CACHE_TTL.WORKSPACES);
@@ -135,23 +138,32 @@ class MotionApiService {
             };
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.ERROR, 'Motion API request failed', errorDetails);
             // Create typed error for better handling
-            const typedError = new Error(errorData?.message || error.message);
-            typedError.response = error.response;
+            const typedError = Object.assign(new Error(errorData?.message || error.message), {
+                response: error.response ? {
+                    status: error.response.status,
+                    statusText: error.response.statusText,
+                    data: error.response.data
+                } : undefined
+            });
             throw typedError;
         });
     }
     /**
-     * Formats API errors consistently across all methods
+     * Formats API errors with user-friendly messages while preserving technical details
      * @param error - The error that occurred
-     * @param action - Description of the action that failed (e.g., 'fetch projects')
-     * @returns Formatted Error object
+     * @param action - Description of the action that failed (e.g., 'fetch', 'create', 'update')
+     * @param resourceType - Type of resource being operated on (e.g., 'project', 'task')
+     * @param resourceId - Optional ID of the resource
+     * @param resourceName - Optional name of the resource
+     * @returns UserFacingError with both user-friendly and technical messages
      */
-    formatApiError(error, action) {
-        const baseMessage = `Failed to ${action}`;
-        const apiMessage = (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined;
-        const errorMessage = getErrorMessage(error);
-        return new Error(`${baseMessage}: ${apiMessage || errorMessage}`);
+    formatApiError(error, action, resourceType, resourceId, resourceName) {
+        const context = (0, userFacingErrors_1.createErrorContext)(action, resourceType, resourceId, resourceName);
+        return (0, userFacingErrors_1.createUserFacingError)(error, context);
     }
+    // ========================================
+    // PRIVATE HELPER METHODS
+    // ========================================
     /**
      * Wraps an axios request with a retry mechanism featuring exponential backoff.
      * Only retries on 5xx server errors or 429 rate-limiting errors.
@@ -208,14 +220,23 @@ class MotionApiService {
         // Should never reach here, but TypeScript requires a return or throw
         throw new Error('Max retries exceeded');
     }
-    async getProjects(workspaceId, maxPages = 5) {
+    // ========================================
+    // PROJECT API METHODS
+    // ========================================
+    async getProjects(workspaceId, options) {
+        const { maxPages = 5, limit } = options || {};
+        // Validate limit parameter if provided
+        if (limit !== undefined && (limit < 0 || !Number.isInteger(limit))) {
+            throw new Error('limit must be a non-negative integer');
+        }
         const cacheKey = `projects:workspace:${workspaceId}`;
         return this.projectCache.withCache(cacheKey, async () => {
             try {
                 (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Fetching projects from Motion API', {
                     method: 'getProjects',
                     workspaceId,
-                    maxPages
+                    maxPages,
+                    limit
                 });
                 // Create a fetch function for potential pagination
                 const fetchPage = async (cursor) => {
@@ -232,7 +253,8 @@ class MotionApiService {
                     // Attempt pagination-aware fetch with new response wrapper
                     const paginatedResult = await (0, paginationNew_1.fetchAllPages)(fetchPage, 'projects', {
                         maxPages,
-                        logProgress: false
+                        logProgress: false,
+                        ...(limit ? { maxItems: limit } : {})
                     });
                     if (paginatedResult.totalFetched > 0) {
                         let projects = paginatedResult.items;
@@ -269,7 +291,7 @@ class MotionApiService {
                     apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
                 });
-                throw this.formatApiError(error, 'fetch projects');
+                throw this.formatApiError(error, 'fetch', 'project');
             }
         });
     }
@@ -307,7 +329,7 @@ class MotionApiService {
                 method: 'getAllProjects',
                 error: getErrorMessage(error)
             });
-            throw this.formatApiError(error, 'fetch all projects');
+            throw this.formatApiError(error, 'fetch', 'project');
         }
     }
     async getProject(projectId) {
@@ -334,7 +356,7 @@ class MotionApiService {
                     apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
                 });
-                throw this.formatApiError(error, 'fetch project');
+                throw this.formatApiError(error, 'fetch', 'project', projectId);
             }
         });
     }
@@ -373,7 +395,7 @@ class MotionApiService {
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                 fullErrorResponse: (0, axios_1.isAxiosError)(error) ? JSON.stringify(error.response?.data, null, 2) : undefined
             });
-            throw this.formatApiError(error, 'create project');
+            throw this.formatApiError(error, 'create', 'project', undefined, projectData.name);
         }
     }
     async updateProject(projectId, updates) {
@@ -403,7 +425,7 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'update project');
+            throw this.formatApiError(error, 'update', 'project', projectId);
         }
     }
     async deleteProject(projectId) {
@@ -428,11 +450,18 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'delete project');
+            throw this.formatApiError(error, 'delete', 'project', projectId);
         }
     }
+    // ========================================
+    // TASK API METHODS
+    // ========================================
     async getTasks(options) {
         const { workspaceId, projectId, status, assigneeId, priority, dueDate, labels, limit, maxPages = 5 } = options;
+        // Validate limit parameter if provided
+        if (limit !== undefined && (limit < 0 || !Number.isInteger(limit))) {
+            throw new Error('limit must be a non-negative integer');
+        }
         try {
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Fetching tasks from Motion API', {
                 method: 'getTasks',
@@ -486,21 +515,17 @@ class MotionApiService {
                     ...(limit ? { maxItems: limit } : {})
                 });
                 if (paginatedResult.totalFetched > 0) {
-                    let tasks = paginatedResult.items;
-                    // Apply limit if specified
-                    if (limit && limit > 0) {
-                        tasks = tasks.slice(0, limit);
-                    }
+                    // Note: limit is already enforced by maxItems in pagination, no need to slice
                     (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Tasks fetched successfully with pagination', {
                         method: 'getTasks',
                         totalCount: paginatedResult.totalFetched,
-                        returnedCount: tasks.length,
+                        returnedCount: paginatedResult.items.length,
                         hasMore: paginatedResult.hasMore,
                         workspaceId,
                         projectId,
                         limitApplied: limit
                     });
-                    return tasks;
+                    return paginatedResult.items;
                 }
             }
             catch (paginationError) {
@@ -534,7 +559,7 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'fetch tasks');
+            throw this.formatApiError(error, 'fetch', 'task');
         }
     }
     async getTask(taskId) {
@@ -559,7 +584,7 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'fetch task');
+            throw this.formatApiError(error, 'fetch', 'task', taskId);
         }
     }
     async createTask(taskData) {
@@ -598,7 +623,7 @@ class MotionApiService {
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                 fullErrorResponse: (0, axios_1.isAxiosError)(error) ? JSON.stringify(error.response?.data, null, 2) : undefined
             });
-            throw this.formatApiError(error, 'create task');
+            throw this.formatApiError(error, 'create', 'task', undefined, taskData.name);
         }
     }
     async updateTask(taskId, updates) {
@@ -626,7 +651,7 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'update task');
+            throw this.formatApiError(error, 'update', 'task', taskId);
         }
     }
     async deleteTask(taskId) {
@@ -649,7 +674,7 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'delete task');
+            throw this.formatApiError(error, 'delete', 'task', taskId);
         }
     }
     async moveTask(taskId, targetProjectId, targetWorkspaceId) {
@@ -675,7 +700,7 @@ class MotionApiService {
                 targetProjectId,
                 targetWorkspaceId
             });
-            // TODO: Invalidate task cache for source and destination projects/workspaces when implemented
+            // Note: No task cache currently implemented - tasks are not cached due to frequent updates
             return response.data;
         }
         catch (error) {
@@ -688,7 +713,7 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'move task');
+            throw this.formatApiError(error, 'move', 'task', taskId);
         }
     }
     async unassignTask(taskId) {
@@ -702,7 +727,7 @@ class MotionApiService {
                 method: 'unassignTask',
                 taskId
             });
-            // TODO: Invalidate task cache for this task and any assignee-related caches when implemented
+            // Note: No task cache currently implemented - tasks are not cached due to frequent updates
             return response.data;
         }
         catch (error) {
@@ -713,9 +738,12 @@ class MotionApiService {
                 apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
             });
-            throw this.formatApiError(error, 'unassign task');
+            throw this.formatApiError(error, 'unassign', 'task', taskId);
         }
     }
+    // ========================================
+    // WORKSPACE API METHODS
+    // ========================================
     async getWorkspaces() {
         return this.workspaceCache.withCache('workspaces', async () => {
             try {
@@ -743,10 +771,13 @@ class MotionApiService {
                     apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
                 });
-                throw this.formatApiError(error, 'fetch workspaces');
+                throw this.formatApiError(error, 'fetch', 'workspace');
             }
         });
     }
+    // ========================================
+    // USER API METHODS
+    // ========================================
     async getUsers(workspaceId) {
         const cacheKey = workspaceId ? `users:workspace:${workspaceId}` : 'users:all';
         return this.userCache.withCache(cacheKey, async () => {
@@ -779,7 +810,7 @@ class MotionApiService {
                     apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
                 });
-                throw this.formatApiError(error, 'fetch users');
+                throw this.formatApiError(error, 'fetch', 'user');
             }
         });
     }
@@ -807,12 +838,14 @@ class MotionApiService {
                     apiStatus: (0, axios_1.isAxiosError)(error) ? error.response?.status : undefined,
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined
                 });
-                throw this.formatApiError(error, 'fetch current user');
+                throw this.formatApiError(error, 'fetch', 'user');
             }
         });
         return cachedUsers[0]; // Return just the user object
     }
-    // Additional methods for intelligent features
+    // ========================================
+    // SEARCH AND RESOLUTION METHODS
+    // ========================================
     /**
      * Resolves a project identifier (either projectId or projectName) to a MotionProject
      * Searches across all workspaces if not found in the specified workspace
@@ -1058,21 +1091,22 @@ class MotionApiService {
             // Apply search limit to prevent resource exhaustion
             const effectiveLimit = limit || constants_1.LIMITS.MAX_SEARCH_RESULTS;
             const lowerQuery = query.toLowerCase();
-            let allMatchingTasks = [];
+            const allMatchingTasks = [];
             // First, search in the specified workspace
             const primaryTasks = await this.getTasks({
                 workspaceId,
-                limit: effectiveLimit,
+                limit: (0, paginationNew_1.calculateAdaptiveFetchLimit)(allMatchingTasks.length, effectiveLimit),
                 maxPages: constants_1.LIMITS.MAX_PAGES
             });
             const primaryMatches = primaryTasks.filter(task => task.name?.toLowerCase().includes(lowerQuery) ||
                 task.description?.toLowerCase().includes(lowerQuery));
-            allMatchingTasks.push(...primaryMatches);
+            allMatchingTasks.push(...primaryMatches.slice(0, effectiveLimit));
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Primary workspace search completed', {
                 method: 'searchTasks',
                 query,
                 primaryWorkspaceId: workspaceId,
-                primaryMatches: primaryMatches.length
+                primaryMatches: primaryMatches.length,
+                keptMatches: allMatchingTasks.length
             });
             // If we haven't reached the limit, search other workspaces
             if (allMatchingTasks.length < effectiveLimit) {
@@ -1083,27 +1117,35 @@ class MotionApiService {
                         if (allMatchingTasks.length >= effectiveLimit)
                             break;
                         try {
+                            // Calculate fetch limit before API call (defense-in-depth)
+                            const fetchLimit = (0, paginationNew_1.calculateAdaptiveFetchLimit)(allMatchingTasks.length, effectiveLimit);
+                            if (fetchLimit <= 0)
+                                break;
                             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Searching additional workspace for tasks', {
                                 method: 'searchTasks',
                                 query,
                                 searchingWorkspaceId: workspace.id,
-                                searchingWorkspaceName: workspace.name
+                                searchingWorkspaceName: workspace.name,
+                                remainingNeeded: effectiveLimit - allMatchingTasks.length
                             });
                             const workspaceTasks = await this.getTasks({
                                 workspaceId: workspace.id,
-                                limit: effectiveLimit,
+                                limit: fetchLimit,
                                 maxPages: constants_1.LIMITS.MAX_PAGES
                             });
                             const workspaceMatches = workspaceTasks.filter(task => task.name?.toLowerCase().includes(lowerQuery) ||
                                 task.description?.toLowerCase().includes(lowerQuery));
-                            allMatchingTasks.push(...workspaceMatches);
+                            // Only add as many as we still need
+                            const remaining = effectiveLimit - allMatchingTasks.length;
+                            allMatchingTasks.push(...workspaceMatches.slice(0, remaining));
                             if (workspaceMatches.length > 0) {
                                 (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Found additional matches in workspace', {
                                     method: 'searchTasks',
                                     query,
                                     workspaceId: workspace.id,
                                     workspaceName: workspace.name,
-                                    matches: workspaceMatches.length
+                                    matches: workspaceMatches.length,
+                                    keptMatches: Math.min(workspaceMatches.length, remaining)
                                 });
                             }
                         }
@@ -1127,17 +1169,14 @@ class MotionApiService {
                     });
                 }
             }
-            // Apply final limit and return results
-            const finalResults = allMatchingTasks.slice(0, effectiveLimit);
+            // Results are already limited during collection, no need to slice again
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Task search completed across all workspaces', {
                 method: 'searchTasks',
                 query,
-                totalMatches: allMatchingTasks.length,
-                returnedResults: finalResults.length,
-                limit: effectiveLimit,
-                crossWorkspaceSearch: allMatchingTasks.length > primaryMatches.length
+                returnedResults: allMatchingTasks.length,
+                limit: effectiveLimit
             });
-            return finalResults;
+            return allMatchingTasks;
         }
         catch (error) {
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.ERROR, 'Failed to search tasks', {
@@ -1159,17 +1198,21 @@ class MotionApiService {
             // Apply search limit to prevent resource exhaustion
             const effectiveLimit = limit || constants_1.LIMITS.MAX_SEARCH_RESULTS;
             const lowerQuery = query.toLowerCase();
-            let allMatchingProjects = [];
+            const allMatchingProjects = [];
             // First, search in the specified workspace
-            const primaryProjects = await this.getProjects(workspaceId, constants_1.LIMITS.MAX_PAGES);
+            const primaryProjects = await this.getProjects(workspaceId, {
+                maxPages: constants_1.LIMITS.MAX_PAGES,
+                limit: (0, paginationNew_1.calculateAdaptiveFetchLimit)(allMatchingProjects.length, effectiveLimit)
+            });
             const primaryMatches = primaryProjects.filter(project => project.name?.toLowerCase().includes(lowerQuery) ||
                 project.description?.toLowerCase().includes(lowerQuery));
-            allMatchingProjects.push(...primaryMatches);
+            allMatchingProjects.push(...primaryMatches.slice(0, effectiveLimit));
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Primary workspace search completed', {
                 method: 'searchProjects',
                 query,
                 primaryWorkspaceId: workspaceId,
-                primaryMatches: primaryMatches.length
+                primaryMatches: primaryMatches.length,
+                keptMatches: allMatchingProjects.length
             });
             // If we haven't reached the limit, search other workspaces
             if (allMatchingProjects.length < effectiveLimit) {
@@ -1180,23 +1223,34 @@ class MotionApiService {
                         if (allMatchingProjects.length >= effectiveLimit)
                             break;
                         try {
+                            // Calculate fetch limit before API call (defense-in-depth)
+                            const fetchLimit = (0, paginationNew_1.calculateAdaptiveFetchLimit)(allMatchingProjects.length, effectiveLimit);
+                            if (fetchLimit <= 0)
+                                break;
                             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Searching additional workspace for projects', {
                                 method: 'searchProjects',
                                 query,
                                 searchingWorkspaceId: workspace.id,
-                                searchingWorkspaceName: workspace.name
+                                searchingWorkspaceName: workspace.name,
+                                remainingNeeded: effectiveLimit - allMatchingProjects.length
+                            });
+                            const workspaceProjects = await this.getProjects(workspace.id, {
+                                maxPages: constants_1.LIMITS.MAX_PAGES,
+                                limit: fetchLimit
                             });
-                            const workspaceProjects = await this.getProjects(workspace.id, constants_1.LIMITS.MAX_PAGES);
                             const workspaceMatches = workspaceProjects.filter(project => project.name?.toLowerCase().includes(lowerQuery) ||
                                 project.description?.toLowerCase().includes(lowerQuery));
-                            allMatchingProjects.push(...workspaceMatches);
+                            // Only add as many as we still need
+                            const remaining = effectiveLimit - allMatchingProjects.length;
+                            allMatchingProjects.push(...workspaceMatches.slice(0, remaining));
                             if (workspaceMatches.length > 0) {
                                 (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Found additional matches in workspace', {
                                     method: 'searchProjects',
                                     query,
                                     workspaceId: workspace.id,
                                     workspaceName: workspace.name,
-                                    matches: workspaceMatches.length
+                                    matches: workspaceMatches.length,
+                                    keptMatches: Math.min(workspaceMatches.length, remaining)
                                 });
                             }
                         }
@@ -1220,17 +1274,14 @@ class MotionApiService {
                     });
                 }
             }
-            // Apply final limit and return results
-            const finalResults = allMatchingProjects.slice(0, effectiveLimit);
+            // Results are already limited during collection, no need to slice again
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Project search completed across all workspaces', {
                 method: 'searchProjects',
                 query,
-                totalMatches: allMatchingProjects.length,
-                returnedResults: finalResults.length,
-                limit: effectiveLimit,
-                crossWorkspaceSearch: allMatchingProjects.length > primaryMatches.length
+                returnedResults: allMatchingProjects.length,
+                limit: effectiveLimit
             });
-            return finalResults;
+            return allMatchingProjects;
         }
         catch (error) {
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.ERROR, 'Failed to search projects', {
@@ -1241,6 +1292,9 @@ class MotionApiService {
             throw error;
         }
     }
+    // ========================================
+    // COMMENT API METHODS
+    // ========================================
     /**
      * Get comments for a task with proper pagination support
      * @param taskId Task ID to get comments for
@@ -1287,7 +1341,7 @@ class MotionApiService {
                     taskId,
                     cursor
                 });
-                throw this.formatApiError(error, 'fetch comments');
+                throw this.formatApiError(error, 'fetch', 'comment');
             }
         });
     }
@@ -1319,9 +1373,12 @@ class MotionApiService {
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                 taskId: commentData?.taskId
             });
-            throw this.formatApiError(error, 'create comment');
+            throw this.formatApiError(error, 'create', 'comment');
         }
     }
+    // ========================================
+    // CUSTOM FIELD API METHODS
+    // ========================================
     /**
      * Fetch custom fields from Motion API
      * @param workspaceId - Required workspace ID to get custom fields for
@@ -1354,7 +1411,7 @@ class MotionApiService {
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                     workspaceId
                 });
-                throw this.formatApiError(error, 'fetch custom fields');
+                throw this.formatApiError(error, 'fetch', 'custom field');
             }
         });
     }
@@ -1401,7 +1458,7 @@ class MotionApiService {
                 fieldName: fieldData?.name,
                 workspaceId
             });
-            throw this.formatApiError(error, 'create custom field');
+            throw this.formatApiError(error, 'create', 'custom field', undefined, fieldData.name);
         }
     }
     /**
@@ -1436,7 +1493,7 @@ class MotionApiService {
                 fieldId,
                 workspaceId
             });
-            throw this.formatApiError(error, 'delete custom field');
+            throw this.formatApiError(error, 'delete', 'custom field', fieldId);
         }
     }
     /**
@@ -1483,7 +1540,7 @@ class MotionApiService {
                 projectId,
                 fieldId
             });
-            throw this.formatApiError(error, 'add custom field to project');
+            throw this.formatApiError(error, 'update', 'project', projectId);
         }
     }
     /**
@@ -1500,8 +1557,7 @@ class MotionApiService {
                 fieldId
             });
             await this.requestWithRetry(() => this.client.delete(`/projects/${projectId}/custom-fields/${fieldId}`));
-            // TODO: Invalidate project cache for specific workspace when project data is available
-            // For now, invalidate all project caches
+            // Invalidate all project caches since we don't have workspace context here
             this.projectCache.invalidate(`projects:`);
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Custom field removed from project successfully', {
                 method: 'removeCustomFieldFromProject',
@@ -1519,7 +1575,7 @@ class MotionApiService {
                 projectId,
                 fieldId
             });
-            throw this.formatApiError(error, 'remove custom field from project');
+            throw this.formatApiError(error, 'update', 'project', projectId);
         }
     }
     /**
@@ -1542,10 +1598,7 @@ class MotionApiService {
                 ...(value !== undefined && { value })
             };
             const response = await this.requestWithRetry(() => this.client.post(`/tasks/${taskId}/custom-fields`, requestData));
-            // TODO: Invalidate task cache when implemented
-            // if (response.data?.workspaceId) {
-            //   this.taskCache.invalidate(`tasks:workspace:${response.data.workspaceId}`);
-            // }
+            // Note: No task cache currently implemented - tasks are not cached due to frequent updates
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Custom field added to task successfully', {
                 method: 'addCustomFieldToTask',
                 taskId,
@@ -1562,7 +1615,7 @@ class MotionApiService {
                 taskId,
                 fieldId
             });
-            throw this.formatApiError(error, 'add custom field to task');
+            throw this.formatApiError(error, 'update', 'task', taskId);
         }
     }
     /**
@@ -1579,8 +1632,7 @@ class MotionApiService {
                 fieldId
             });
             await this.requestWithRetry(() => this.client.delete(`/tasks/${taskId}/custom-fields/${fieldId}`));
-            // TODO: Invalidate task cache when implemented
-            // this.taskCache.invalidate(`tasks:`);
+            // Note: No task cache currently implemented - tasks are not cached due to frequent updates
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Custom field removed from task successfully', {
                 method: 'removeCustomFieldFromTask',
                 taskId,
@@ -1597,23 +1649,28 @@ class MotionApiService {
                 taskId,
                 fieldId
             });
-            throw this.formatApiError(error, 'remove custom field from task');
+            throw this.formatApiError(error, 'update', 'task', taskId);
         }
     }
+    // ========================================
+    // RECURRING TASK API METHODS
+    // ========================================
     /**
      * Fetch recurring tasks from Motion API with automatic pagination
      * @param workspaceId - Optional workspace ID to filter recurring tasks
-     * @param maxPages - Maximum number of pages to fetch (default: 10)
+     * @param options - Optional configuration for maxPages and limit
      * @returns Array of recurring tasks from all pages
      */
-    async getRecurringTasks(workspaceId, maxPages = 10) {
+    async getRecurringTasks(workspaceId, options) {
+        const { maxPages = 10, limit } = options || {};
         const cacheKey = workspaceId ? `recurring-tasks:workspace:${workspaceId}` : 'recurring-tasks:all';
         return this.recurringTaskCache.withCache(cacheKey, async () => {
             try {
                 (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Fetching recurring tasks from Motion API with pagination', {
                     method: 'getRecurringTasks',
                     workspaceId,
-                    maxPages
+                    maxPages,
+                    limit
                 });
                 // Create a fetch function for pagination utility
                 const fetchPage = async (cursor) => {
@@ -1629,7 +1686,8 @@ class MotionApiService {
                 // Use pagination utility to fetch all pages
                 const paginatedResult = await (0, paginationNew_1.fetchAllPages)(fetchPage, 'recurring-tasks', {
                     maxPages,
-                    logProgress: true
+                    logProgress: true,
+                    ...(limit ? { maxItems: limit } : {})
                 });
                 (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'Recurring tasks fetched successfully with pagination', {
                     method: 'getRecurringTasks',
@@ -1648,7 +1706,7 @@ class MotionApiService {
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                     workspaceId
                 });
-                throw this.formatApiError(error, 'fetch recurring tasks');
+                throw this.formatApiError(error, 'fetch', 'recurring task');
             }
         });
     }
@@ -1659,15 +1717,30 @@ class MotionApiService {
      */
     async createRecurringTask(taskData) {
         try {
+            // Validate frequency object before transformation
+            const freqValidation = (0, frequencyTransform_1.validateFrequencyObject)(taskData.frequency);
+            if (!freqValidation.valid) {
+                throw new Error(`Invalid frequency object: ${freqValidation.reason || 'Unknown reason'}`);
+            }
+            // Transform frequency object to API string format
+            const frequencyString = (0, frequencyTransform_1.transformFrequencyToApiString)(taskData.frequency);
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Creating recurring task in Motion API', {
                 method: 'createRecurringTask',
                 name: taskData.name,
                 assigneeId: taskData.assigneeId,
-                frequency: taskData.frequency.type,
+                frequency: frequencyString,
+                originalFrequency: taskData.frequency,
                 workspaceId: taskData.workspaceId
             });
+            // Create payload with transformed frequency while preserving other frequency fields
+            const apiPayload = {
+                ...taskData,
+                frequency: frequencyString,
+                // Preserve endDate and other fields that should be sent separately to the API
+                ...(taskData.frequency.endDate && { endDate: taskData.frequency.endDate })
+            };
             // Create minimal payload by removing empty/null values to avoid validation errors
-            const minimalPayload = (0, constants_1.createMinimalPayload)(taskData);
+            const minimalPayload = (0, constants_1.createMinimalPayload)(apiPayload);
             const response = await this.requestWithRetry(() => this.client.post('/recurring-tasks', minimalPayload));
             // Invalidate cache after successful creation
             this.recurringTaskCache.invalidate('recurring-tasks:');
@@ -1686,7 +1759,7 @@ class MotionApiService {
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                 taskName: taskData?.name
             });
-            throw this.formatApiError(error, 'create recurring task');
+            throw this.formatApiError(error, 'create', 'recurring task', undefined, taskData.name);
         }
     }
     /**
@@ -1717,9 +1790,12 @@ class MotionApiService {
                 apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                 recurringTaskId
             });
-            throw this.formatApiError(error, 'delete recurring task');
+            throw this.formatApiError(error, 'delete', 'recurring task', recurringTaskId);
         }
     }
+    // ========================================
+    // SCHEDULE API METHODS
+    // ========================================
     /**
      * Get available schedule names for auto-scheduling
      * @param workspaceId - Optional workspace ID to filter schedules (currently unused by Motion API)
@@ -1747,7 +1823,7 @@ class MotionApiService {
                 error: getErrorMessage(error),
                 workspaceId
             });
-            throw this.formatApiError(error, 'fetch available schedule names');
+            throw this.formatApiError(error, 'fetch', 'schedule');
         }
     }
     /**
@@ -1805,10 +1881,13 @@ class MotionApiService {
                     startDate,
                     endDate
                 });
-                throw this.formatApiError(error, 'fetch schedules');
+                throw this.formatApiError(error, 'fetch', 'schedule');
             }
         });
     }
+    // ========================================
+    // STATUS API METHODS
+    // ========================================
     /**
      * Retrieves available workflow statuses from Motion
      * @param workspaceId - Optional workspace ID to filter statuses
@@ -1853,10 +1932,13 @@ class MotionApiService {
                     apiMessage: (0, axios_1.isAxiosError)(error) ? error.response?.data?.message : undefined,
                     workspaceId
                 });
-                throw this.formatApiError(error, 'fetch statuses');
+                throw this.formatApiError(error, 'fetch', 'status');
             }
         });
     }
+    // ========================================
+    // UTILITY METHODS
+    // ========================================
     /**
      * Get all uncompleted tasks across all workspaces and projects
      * Filters tasks where status.isResolvedStatus is false or undefined
@@ -1883,10 +1965,14 @@ class MotionApiService {
                         break; // Stop if we've reached the limit
                     }
                     try {
-                        // Get all tasks from this workspace (all projects)
+                        // Calculate fetch limit before API call (defense-in-depth)
+                        const fetchLimit = (0, paginationNew_1.calculateAdaptiveFetchLimit)(allUncompletedTasks.length, effectiveLimit);
+                        if (fetchLimit <= 0)
+                            break;
+                        // Get tasks from this workspace with adaptive limit
                         const workspaceTasks = await this.getTasks({
                             workspaceId: workspace.id,
-                            limit: effectiveLimit,
+                            limit: fetchLimit,
                             maxPages: constants_1.LIMITS.MAX_PAGES
                         });
                         // Filter for uncompleted tasks
@@ -1898,13 +1984,16 @@ class MotionApiService {
                                 return true; // Simple string status = assume not resolved
                             return !task.status.isResolvedStatus; // Object status with isResolvedStatus false
                         });
-                        allUncompletedTasks.push(...uncompletedTasks);
+                        // Only add as many as we still need
+                        const remaining = effectiveLimit - allUncompletedTasks.length;
+                        allUncompletedTasks.push(...uncompletedTasks.slice(0, remaining));
                         if (uncompletedTasks.length > 0) {
                             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.DEBUG, 'Found uncompleted tasks in workspace', {
                                 method: 'getAllUncompletedTasks',
                                 workspaceId: workspace.id,
                                 workspaceName: workspace.name,
                                 uncompletedTasks: uncompletedTasks.length,
+                                keptTasks: Math.min(uncompletedTasks.length, remaining),
                                 totalTasks: workspaceTasks.length
                             });
                         }
@@ -1927,15 +2016,13 @@ class MotionApiService {
                 });
                 throw workspaceListError;
             }
-            // Apply final limit and return results
-            const finalResults = allUncompletedTasks.slice(0, effectiveLimit);
+            // Results are already limited during collection, no need to slice again
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.INFO, 'All uncompleted tasks fetched successfully', {
                 method: 'getAllUncompletedTasks',
-                totalFound: allUncompletedTasks.length,
-                returned: finalResults.length,
+                returned: allUncompletedTasks.length,
                 limit: effectiveLimit
             });
-            return finalResults;
+            return allUncompletedTasks;
         }
         catch (error) {
             (0, logger_1.mcpLog)(constants_1.LOG_LEVELS.ERROR, 'Failed to fetch all uncompleted tasks', {