@panoptic-it-solutions/zoho-projects-client 0.2.4 → 0.2.6

package/dist/client.js

@@ -96,8 +96,8 @@ export function createZohoProjectsClient(config) {
         }
         return result.data;
     }
-    // Base path for portal-specific endpoints
-    const basePath = `/restapi/portal/${portalId}`;
+    // Base path for portal-specific endpoints (V3 API)
+    const basePath = `/api/v3/portal/${portalId}`;
     return {
         /**
          * Projects API
@@ -107,17 +107,20 @@ export function createZohoProjectsClient(config) {
              * List projects with pagination
              */
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/projects/`, ProjectListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects`, ProjectListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                         sort_column: params?.sort_column,
                         sort_order: params?.sort_order,
                     },
                 });
+                // V3 API returns array directly, legacy API wraps in { projects: [...] }
+                const projects = Array.isArray(response) ? response : response.projects;
+                const pageInfo = Array.isArray(response) ? undefined : response.page_info;
                 return {
-                    data: response.projects,
-                    pageInfo: response.page_info,
+                    data: projects,
+                    pageInfo,
                 };
             },
             /**
@@ -130,37 +133,65 @@ export function createZohoProjectsClient(config) {
              * Iterate over all projects with auto-pagination
              */
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             /**
              * Get a single project by ID
              */
             async get(projectId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/`, z.object({ projects: z.array(ProjectSchema) }));
-                if (response.projects.length === 0) {
-                    throw new ZohoProjectsError(`Project not found: ${projectId}`, 404);
+                // V3 API returns project directly, legacy wraps in {projects: [...]}
+                const schema = z.union([
+                    ProjectSchema, // V3: returns project directly
+                    z.object({ projects: z.array(ProjectSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}`, schema);
+                // Handle both formats
+                if (response && typeof response === "object" && "projects" in response) {
+                    const legacyResponse = response;
+                    if (legacyResponse.projects.length === 0) {
+                        throw new ZohoProjectsError(`Project not found: ${projectId}`, 404);
+                    }
+                    return legacyResponse.projects[0];
                 }
-                return response.projects[0];
+                return response;
             },
             /**
              * Create a new project
              */
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/projects/`, z.object({ projects: z.array(ProjectSchema) }), { method: "POST", data });
-                return response.projects[0];
+                // V3 API returns project directly, legacy wraps in {projects: [...]}
+                const schema = z.union([
+                    ProjectSchema, // V3: returns project directly
+                    z.object({ projects: z.array(ProjectSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects`, schema, { method: "POST", data });
+                // Handle both formats
+                if (response && typeof response === "object" && "projects" in response) {
+                    return response.projects[0];
+                }
+                return response;
             },
             /**
              * Update an existing project
              */
             async update(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/`, z.object({ projects: z.array(ProjectSchema) }), { method: "PUT", data });
-                return response.projects[0];
+                // V3 API returns project directly, legacy wraps in {projects: [...]}
+                const schema = z.union([
+                    ProjectSchema, // V3: returns project directly
+                    z.object({ projects: z.array(ProjectSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}`, schema, { method: "PUT", data });
+                // Handle both formats
+                if (response && typeof response === "object" && "projects" in response) {
+                    return response.projects[0];
+                }
+                return response;
             },
             /**
              * Delete a project (moves to trash)
              */
             async delete(projectId) {
-                await request(`${basePath}/projects/${projectId}/`, {
+                await request(`${basePath}/projects/${projectId}`, {
                     method: "DELETE",
                 });
             },
@@ -173,10 +204,10 @@ export function createZohoProjectsClient(config) {
              * List tasks for a project with pagination
              */
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks/`, TaskListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks`, TaskListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                         sort_column: params?.sort_column,
                         sort_order: params?.sort_order,
                     },
@@ -196,17 +227,27 @@ export function createZohoProjectsClient(config) {
              * Iterate over all tasks for a project with auto-pagination
              */
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             /**
              * Get a single task by ID
              */
             async get(projectId, taskId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks/${taskId}/`, z.object({ tasks: z.array(TaskSchema) }));
-                if (response.tasks.length === 0) {
-                    throw new ZohoProjectsError(`Task not found: ${taskId}`, 404);
+                // V3 API returns task directly, legacy wraps in {tasks: [...]}
+                const schema = z.union([
+                    TaskSchema, // V3: returns task directly
+                    z.object({ tasks: z.array(TaskSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks/${taskId}`, schema);
+                // Handle both formats
+                if (response && typeof response === "object" && "tasks" in response) {
+                    const legacyResponse = response;
+                    if (legacyResponse.tasks.length === 0) {
+                        throw new ZohoProjectsError(`Task not found: ${taskId}`, 404);
+                    }
+                    return legacyResponse.tasks[0];
                 }
-                return response.tasks[0];
+                return response;
             },
             /**
              * List all tasks across all projects
@@ -216,30 +257,51 @@ export function createZohoProjectsClient(config) {
                 const projects = await this._getProjectsRef().listAll();
                 const allTasks = [];
                 for (const project of projects) {
-                    const tasks = await this.listAll(project.id_string, options);
+                    // V3 API uses 'id' as string directly, legacy uses 'id_string'
+                    const tasks = await this.listAll(String(project.id), options);
                     allTasks.push(...tasks);
                 }
                 return allTasks;
             },
             /**
              * Create a new task in a project
+             * Note: V3 API requires a tasklist to be specified
              */
             async create(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks/`, z.object({ tasks: z.array(TaskSchema) }), { method: "POST", data });
-                return response.tasks[0];
+                // V3 API returns task directly, legacy wraps in {tasks: [...]}
+                const schema = z.union([
+                    TaskSchema, // V3: returns task directly
+                    z.object({ tasks: z.array(TaskSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks`, schema, { method: "POST", data });
+                // Handle both formats
+                if (response && typeof response === "object" && "tasks" in response) {
+                    return response.tasks[0];
+                }
+                return response;
             },
             /**
              * Update an existing task
+             * Note: V3 API uses PATCH method for updates
              */
             async update(projectId, taskId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks/${taskId}/`, z.object({ tasks: z.array(TaskSchema) }), { method: "PUT", data });
-                return response.tasks[0];
+                // V3 API returns task directly, legacy wraps in {tasks: [...]}
+                const schema = z.union([
+                    TaskSchema, // V3: returns task directly
+                    z.object({ tasks: z.array(TaskSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasks/${taskId}`, schema, { method: "PATCH", data });
+                // Handle both formats
+                if (response && typeof response === "object" && "tasks" in response) {
+                    return response.tasks[0];
+                }
+                return response;
             },
             /**
              * Delete a task (moves to trash)
              */
             async delete(projectId, taskId) {
-                await request(`${basePath}/projects/${projectId}/tasks/${taskId}/`, {
+                await request(`${basePath}/projects/${projectId}/tasks/${taskId}`, {
                     method: "DELETE",
                 });
             },
@@ -255,10 +317,10 @@ export function createZohoProjectsClient(config) {
              */
             async list(projectId, params) {
                 // Make the request - may return 204 No Content if no logs
-                const rawResponse = await request(`${basePath}/projects/${projectId}/logs/`, {
+                const rawResponse = await request(`${basePath}/projects/${projectId}/logs`, {
                     params: {
-                        index: params.index ?? 0,
-                        range: params.range ?? DEFAULT_PAGE_SIZE,
+                        page: params.page ?? 1,
+                        per_page: params.per_page ?? DEFAULT_PAGE_SIZE,
                         users_list: params.users_list,
                         view_type: params.view_type,
                         date: params.date,
@@ -310,7 +372,7 @@ export function createZohoProjectsClient(config) {
              * Iterate over all time logs for a project with auto-pagination
              */
             iterate(projectId, params, options) {
-                return autoPaginate((index, range) => this.list(projectId, { ...params, index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { ...params, page, per_page }), options);
             },
             /**
              * List all time logs across all projects
@@ -319,7 +381,8 @@ export function createZohoProjectsClient(config) {
                 const projects = await this._getProjectsRef().listAll();
                 const allLogs = [];
                 for (const project of projects) {
-                    const logs = await this.listAll(project.id_string, params, options);
+                    // V3 API uses 'id' as string directly, legacy uses 'id_string'
+                    const logs = await this.listAll(String(project.id), params, options);
                     allLogs.push(...logs);
                 }
                 return allLogs;
@@ -328,28 +391,28 @@ export function createZohoProjectsClient(config) {
              * Create a time log for a task
              */
             async createForTask(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs/`, z.object({ timelogs: z.object({ tasklogs: z.array(TimeLogSchema) }) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs`, z.object({ timelogs: z.object({ tasklogs: z.array(TimeLogSchema) }) }), { method: "POST", data });
                 return response.timelogs.tasklogs[0];
             },
             /**
              * Create a time log for a bug
              */
             async createForBug(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs/`, z.object({ timelogs: z.object({ buglogs: z.array(TimeLogSchema) }) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs`, z.object({ timelogs: z.object({ buglogs: z.array(TimeLogSchema) }) }), { method: "POST", data });
                 return response.timelogs.buglogs[0];
             },
             /**
              * Create a general time log (not tied to task or bug)
              */
             async createGeneral(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs/`, z.object({ timelogs: z.object({ generallogs: z.array(TimeLogSchema) }) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs`, z.object({ timelogs: z.object({ generallogs: z.array(TimeLogSchema) }) }), { method: "POST", data });
                 return response.timelogs.generallogs[0];
             },
             /**
              * Update a time log
              */
             async update(projectId, logId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs/${logId}/`, z.object({ timelogs: z.object({ tasklogs: z.array(TimeLogSchema).optional(), buglogs: z.array(TimeLogSchema).optional(), generallogs: z.array(TimeLogSchema).optional() }) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/logs/${logId}`, z.object({ timelogs: z.object({ tasklogs: z.array(TimeLogSchema).optional(), buglogs: z.array(TimeLogSchema).optional(), generallogs: z.array(TimeLogSchema).optional() }) }), { method: "PUT", data });
                 // Return whichever type was updated
                 const logs = response.timelogs.tasklogs || response.timelogs.buglogs || response.timelogs.generallogs || [];
                 return logs[0];
@@ -358,7 +421,7 @@ export function createZohoProjectsClient(config) {
              * Delete a time log
              */
             async delete(projectId, logId) {
-                await request(`${basePath}/projects/${projectId}/logs/${logId}/`, {
+                await request(`${basePath}/projects/${projectId}/logs/${logId}`, {
                     method: "DELETE",
                 });
             },
@@ -373,10 +436,10 @@ export function createZohoProjectsClient(config) {
              * List all users in the portal
              */
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/users/`, UserListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/users`, UserListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return {
@@ -394,13 +457,13 @@ export function createZohoProjectsClient(config) {
              * Iterate over all users with auto-pagination
              */
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             /**
              * Get a single user by ID
              */
             async get(userId) {
-                const response = await requestWithValidation(`${basePath}/users/${userId}/`, z.object({ users: z.array(UserSchema) }));
+                const response = await requestWithValidation(`${basePath}/users/${userId}`, z.object({ users: z.array(UserSchema) }));
                 if (response.users.length === 0) {
                     throw new ZohoProjectsError(`User not found: ${userId}`, 404);
                 }
@@ -410,10 +473,10 @@ export function createZohoProjectsClient(config) {
              * List users for a specific project
              */
             async listForProject(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/users/`, UserListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/users`, UserListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return {
@@ -425,28 +488,28 @@ export function createZohoProjectsClient(config) {
              * Invite a new user to the portal
              */
             async invite(data) {
-                const response = await requestWithValidation(`${basePath}/users/`, z.object({ users: z.array(UserSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/users`, z.object({ users: z.array(UserSchema) }), { method: "POST", data });
                 return response.users[0];
             },
             /**
              * Add a user to a project
              */
             async addToProject(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/users/`, z.object({ users: z.array(UserSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/users`, z.object({ users: z.array(UserSchema) }), { method: "POST", data });
                 return response.users[0];
             },
             /**
              * Update a user's details
              */
             async update(userId, data) {
-                const response = await requestWithValidation(`${basePath}/users/${userId}/`, z.object({ users: z.array(UserSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/users/${userId}`, z.object({ users: z.array(UserSchema) }), { method: "PUT", data });
                 return response.users[0];
             },
             /**
              * Remove a user from the portal
              */
             async delete(userId) {
-                await request(`${basePath}/users/${userId}/`, {
+                await request(`${basePath}/users/${userId}`, {
                     method: "DELETE",
                 });
             },
@@ -454,7 +517,7 @@ export function createZohoProjectsClient(config) {
              * Remove a user from a project
              */
             async removeFromProject(projectId, userId) {
-                await request(`${basePath}/projects/${projectId}/users/${userId}/`, {
+                await request(`${basePath}/projects/${projectId}/users/${userId}`, {
                     method: "DELETE",
                 });
             },
@@ -464,10 +527,10 @@ export function createZohoProjectsClient(config) {
          */
         tags: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/tags/`, TagListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/tags`, TagListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.tags, pageInfo: response.page_info };
@@ -476,25 +539,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(tagId) {
-                const response = await requestWithValidation(`${basePath}/tags/${tagId}/`, z.object({ tags: z.array(TagSchema) }));
+                const response = await requestWithValidation(`${basePath}/tags/${tagId}`, z.object({ tags: z.array(TagSchema) }));
                 if (response.tags.length === 0) {
                     throw new ZohoProjectsError(`Tag not found: ${tagId}`, 404);
                 }
                 return response.tags[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/tags/`, z.object({ tags: z.array(TagSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/tags`, z.object({ tags: z.array(TagSchema) }), { method: "POST", data });
                 return response.tags[0];
             },
             async update(tagId, data) {
-                const response = await requestWithValidation(`${basePath}/tags/${tagId}/`, z.object({ tags: z.array(TagSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/tags/${tagId}`, z.object({ tags: z.array(TagSchema) }), { method: "PUT", data });
                 return response.tags[0];
             },
             async delete(tagId) {
-                await request(`${basePath}/tags/${tagId}/`, { method: "DELETE" });
+                await request(`${basePath}/tags/${tagId}`, { method: "DELETE" });
             },
         },
         /**
@@ -502,10 +565,10 @@ export function createZohoProjectsClient(config) {
          */
         roles: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/roles/`, RoleListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/roles`, RoleListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.roles, pageInfo: response.page_info };
@@ -514,25 +577,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(roleId) {
-                const response = await requestWithValidation(`${basePath}/roles/${roleId}/`, z.object({ roles: z.array(RoleSchema) }));
+                const response = await requestWithValidation(`${basePath}/roles/${roleId}`, z.object({ roles: z.array(RoleSchema) }));
                 if (response.roles.length === 0) {
                     throw new ZohoProjectsError(`Role not found: ${roleId}`, 404);
                 }
                 return response.roles[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/roles/`, z.object({ roles: z.array(RoleSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/roles`, z.object({ roles: z.array(RoleSchema) }), { method: "POST", data });
                 return response.roles[0];
             },
             async update(roleId, data) {
-                const response = await requestWithValidation(`${basePath}/roles/${roleId}/`, z.object({ roles: z.array(RoleSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/roles/${roleId}`, z.object({ roles: z.array(RoleSchema) }), { method: "PUT", data });
                 return response.roles[0];
             },
             async delete(roleId) {
-                await request(`${basePath}/roles/${roleId}/`, { method: "DELETE" });
+                await request(`${basePath}/roles/${roleId}`, { method: "DELETE" });
             },
         },
         /**
@@ -540,10 +603,10 @@ export function createZohoProjectsClient(config) {
          */
         profiles: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/profiles/`, ProfileListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/profiles`, ProfileListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.profiles, pageInfo: response.page_info };
@@ -552,25 +615,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(profileId) {
-                const response = await requestWithValidation(`${basePath}/profiles/${profileId}/`, z.object({ profiles: z.array(ProfileSchema) }));
+                const response = await requestWithValidation(`${basePath}/profiles/${profileId}`, z.object({ profiles: z.array(ProfileSchema) }));
                 if (response.profiles.length === 0) {
                     throw new ZohoProjectsError(`Profile not found: ${profileId}`, 404);
                 }
                 return response.profiles[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/profiles/`, z.object({ profiles: z.array(ProfileSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/profiles`, z.object({ profiles: z.array(ProfileSchema) }), { method: "POST", data });
                 return response.profiles[0];
             },
             async update(profileId, data) {
-                const response = await requestWithValidation(`${basePath}/profiles/${profileId}/`, z.object({ profiles: z.array(ProfileSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/profiles/${profileId}`, z.object({ profiles: z.array(ProfileSchema) }), { method: "PUT", data });
                 return response.profiles[0];
             },
             async delete(profileId) {
-                await request(`${basePath}/profiles/${profileId}/`, { method: "DELETE" });
+                await request(`${basePath}/profiles/${profileId}`, { method: "DELETE" });
             },
         },
         /**
@@ -578,10 +641,10 @@ export function createZohoProjectsClient(config) {
          */
         clients: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/clients/`, ClientListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/clients`, ClientListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.clients, pageInfo: response.page_info };
@@ -590,25 +653,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(clientId) {
-                const response = await requestWithValidation(`${basePath}/clients/${clientId}/`, z.object({ clients: z.array(ClientSchema) }));
+                const response = await requestWithValidation(`${basePath}/clients/${clientId}`, z.object({ clients: z.array(ClientSchema) }));
                 if (response.clients.length === 0) {
                     throw new ZohoProjectsError(`Client not found: ${clientId}`, 404);
                 }
                 return response.clients[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/clients/`, z.object({ clients: z.array(ClientSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/clients`, z.object({ clients: z.array(ClientSchema) }), { method: "POST", data });
                 return response.clients[0];
             },
             async update(clientId, data) {
-                const response = await requestWithValidation(`${basePath}/clients/${clientId}/`, z.object({ clients: z.array(ClientSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/clients/${clientId}`, z.object({ clients: z.array(ClientSchema) }), { method: "PUT", data });
                 return response.clients[0];
             },
             async delete(clientId) {
-                await request(`${basePath}/clients/${clientId}/`, { method: "DELETE" });
+                await request(`${basePath}/clients/${clientId}`, { method: "DELETE" });
             },
         },
         /**
@@ -616,10 +679,10 @@ export function createZohoProjectsClient(config) {
          */
         contacts: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/contacts/`, ContactListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/contacts`, ContactListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.contacts, pageInfo: response.page_info };
@@ -628,25 +691,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(contactId) {
-                const response = await requestWithValidation(`${basePath}/contacts/${contactId}/`, z.object({ contacts: z.array(ContactSchema) }));
+                const response = await requestWithValidation(`${basePath}/contacts/${contactId}`, z.object({ contacts: z.array(ContactSchema) }));
                 if (response.contacts.length === 0) {
                     throw new ZohoProjectsError(`Contact not found: ${contactId}`, 404);
                 }
                 return response.contacts[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/contacts/`, z.object({ contacts: z.array(ContactSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/contacts`, z.object({ contacts: z.array(ContactSchema) }), { method: "POST", data });
                 return response.contacts[0];
             },
             async update(contactId, data) {
-                const response = await requestWithValidation(`${basePath}/contacts/${contactId}/`, z.object({ contacts: z.array(ContactSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/contacts/${contactId}`, z.object({ contacts: z.array(ContactSchema) }), { method: "PUT", data });
                 return response.contacts[0];
             },
             async delete(contactId) {
-                await request(`${basePath}/contacts/${contactId}/`, { method: "DELETE" });
+                await request(`${basePath}/contacts/${contactId}`, { method: "DELETE" });
             },
         },
         /**
@@ -654,10 +717,10 @@ export function createZohoProjectsClient(config) {
          */
         groups: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/groups/`, ProjectGroupListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/groups`, ProjectGroupListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.groups, pageInfo: response.page_info };
@@ -666,25 +729,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(groupId) {
-                const response = await requestWithValidation(`${basePath}/groups/${groupId}/`, z.object({ groups: z.array(ProjectGroupSchema) }));
+                const response = await requestWithValidation(`${basePath}/groups/${groupId}`, z.object({ groups: z.array(ProjectGroupSchema) }));
                 if (response.groups.length === 0) {
                     throw new ZohoProjectsError(`Project group not found: ${groupId}`, 404);
                 }
                 return response.groups[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/groups/`, z.object({ groups: z.array(ProjectGroupSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/groups`, z.object({ groups: z.array(ProjectGroupSchema) }), { method: "POST", data });
                 return response.groups[0];
             },
             async update(groupId, data) {
-                const response = await requestWithValidation(`${basePath}/groups/${groupId}/`, z.object({ groups: z.array(ProjectGroupSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/groups/${groupId}`, z.object({ groups: z.array(ProjectGroupSchema) }), { method: "PUT", data });
                 return response.groups[0];
             },
             async delete(groupId) {
-                await request(`${basePath}/groups/${groupId}/`, { method: "DELETE" });
+                await request(`${basePath}/groups/${groupId}`, { method: "DELETE" });
             },
         },
         /**
@@ -692,10 +755,10 @@ export function createZohoProjectsClient(config) {
          */
         leaves: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/leaves/`, LeaveListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/leaves`, LeaveListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.leaves, pageInfo: response.page_info };
@@ -704,25 +767,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(leaveId) {
-                const response = await requestWithValidation(`${basePath}/leaves/${leaveId}/`, z.object({ leaves: z.array(LeaveSchema) }));
+                const response = await requestWithValidation(`${basePath}/leaves/${leaveId}`, z.object({ leaves: z.array(LeaveSchema) }));
                 if (response.leaves.length === 0) {
                     throw new ZohoProjectsError(`Leave not found: ${leaveId}`, 404);
                 }
                 return response.leaves[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/leaves/`, z.object({ leaves: z.array(LeaveSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/leaves`, z.object({ leaves: z.array(LeaveSchema) }), { method: "POST", data });
                 return response.leaves[0];
             },
             async update(leaveId, data) {
-                const response = await requestWithValidation(`${basePath}/leaves/${leaveId}/`, z.object({ leaves: z.array(LeaveSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/leaves/${leaveId}`, z.object({ leaves: z.array(LeaveSchema) }), { method: "PUT", data });
                 return response.leaves[0];
             },
             async delete(leaveId) {
-                await request(`${basePath}/leaves/${leaveId}/`, { method: "DELETE" });
+                await request(`${basePath}/leaves/${leaveId}`, { method: "DELETE" });
             },
         },
         /**
@@ -730,10 +793,10 @@ export function createZohoProjectsClient(config) {
          */
         teams: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/teams/`, TeamListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/teams`, TeamListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.teams, pageInfo: response.page_info };
@@ -742,32 +805,32 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(teamId) {
-                const response = await requestWithValidation(`${basePath}/teams/${teamId}/`, z.object({ teams: z.array(TeamSchema) }));
+                const response = await requestWithValidation(`${basePath}/teams/${teamId}`, z.object({ teams: z.array(TeamSchema) }));
                 if (response.teams.length === 0) {
                     throw new ZohoProjectsError(`Team not found: ${teamId}`, 404);
                 }
                 return response.teams[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/teams/`, z.object({ teams: z.array(TeamSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/teams`, z.object({ teams: z.array(TeamSchema) }), { method: "POST", data });
                 return response.teams[0];
             },
             async update(teamId, data) {
-                const response = await requestWithValidation(`${basePath}/teams/${teamId}/`, z.object({ teams: z.array(TeamSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/teams/${teamId}`, z.object({ teams: z.array(TeamSchema) }), { method: "PUT", data });
                 return response.teams[0];
             },
             async delete(teamId) {
-                await request(`${basePath}/teams/${teamId}/`, { method: "DELETE" });
+                await request(`${basePath}/teams/${teamId}`, { method: "DELETE" });
             },
             async addMembers(teamId, data) {
                 const response = await requestWithValidation(`${basePath}/teams/${teamId}/members/`, z.object({ teams: z.array(TeamSchema) }), { method: "POST", data });
                 return response.teams[0];
             },
             async removeMember(teamId, userId) {
-                await request(`${basePath}/teams/${teamId}/members/${userId}/`, {
+                await request(`${basePath}/teams/${teamId}/members/${userId}`, {
                     method: "DELETE",
                 });
             },
@@ -777,10 +840,10 @@ export function createZohoProjectsClient(config) {
          */
         tasklists: {
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists/`, TaskListListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists`, TaskListListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.tasklists, pageInfo: response.page_info };
@@ -789,25 +852,28 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(projectId, options));
             },
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             async get(projectId, tasklistId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists/${tasklistId}/`, z.object({ tasklists: z.array(TaskListSchema) }));
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists/${tasklistId}`, z.object({ tasklists: z.array(TaskListSchema) }));
                 if (response.tasklists.length === 0) {
                     throw new ZohoProjectsError(`Task list not found: ${tasklistId}`, 404);
                 }
                 return response.tasklists[0];
             },
             async create(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists/`, z.object({ tasklists: z.array(TaskListSchema) }), { method: "POST", data });
-                return response.tasklists[0];
+                // V3 API returns the tasklist directly, not wrapped in array
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists`, TaskListSchema, { method: "POST", data });
+                return response;
             },
             async update(projectId, tasklistId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists/${tasklistId}/`, z.object({ tasklists: z.array(TaskListSchema) }), { method: "PUT", data });
-                return response.tasklists[0];
+                // V3 API returns the tasklist directly, not wrapped in array
+                // V3 API uses PATCH method for updates
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/tasklists/${tasklistId}`, TaskListSchema, { method: "PATCH", data });
+                return response;
             },
             async delete(projectId, tasklistId) {
-                await request(`${basePath}/projects/${projectId}/tasklists/${tasklistId}/`, { method: "DELETE" });
+                await request(`${basePath}/projects/${projectId}/tasklists/${tasklistId}`, { method: "DELETE" });
             },
         },
         /**
@@ -816,37 +882,73 @@ export function createZohoProjectsClient(config) {
          */
         phases: {
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones/`, PhaseListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones`, PhaseListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
-                return { data: response.milestones, pageInfo: response.page_info };
+                // V3 API returns page_info as array, normalize to object
+                let pageInfo;
+                if (response.page_info) {
+                    if (Array.isArray(response.page_info)) {
+                        const info = response.page_info[0];
+                        if (info) {
+                            pageInfo = {
+                                page: info.page,
+                                per_page: info.per_page,
+                                has_more_page: info.has_next_page,
+                            };
+                        }
+                    }
+                    else {
+                        pageInfo = response.page_info;
+                    }
+                }
+                return { data: response.milestones, pageInfo };
             },
             async listAll(projectId, options) {
                 return collectAll(this.iterate(projectId, options));
             },
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             async get(projectId, phaseId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones/${phaseId}/`, z.object({ milestones: z.array(PhaseSchema) }));
-                if (response.milestones.length === 0) {
-                    throw new ZohoProjectsError(`Phase not found: ${phaseId}`, 404);
+                // V3 API returns milestone directly, legacy wraps in {milestones: [...]}
+                const schema = z.union([
+                    PhaseSchema, // V3: returns milestone directly
+                    z.object({ milestones: z.array(PhaseSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones/${phaseId}`, schema);
+                // Handle both formats
+                if (response && typeof response === "object" && "milestones" in response) {
+                    const legacyResponse = response;
+                    if (legacyResponse.milestones.length === 0) {
+                        throw new ZohoProjectsError(`Phase not found: ${phaseId}`, 404);
+                    }
+                    return legacyResponse.milestones[0];
                 }
-                return response.milestones[0];
+                return response;
             },
             async create(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones/`, z.object({ milestones: z.array(PhaseSchema) }), { method: "POST", data });
-                return response.milestones[0];
+                // V3 API returns milestone directly, legacy wraps in {milestones: [...]}
+                const schema = z.union([
+                    PhaseSchema, // V3: returns milestone directly
+                    z.object({ milestones: z.array(PhaseSchema) }), // Legacy
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones`, schema, { method: "POST", data });
+                // Handle both formats
+                if (response && typeof response === "object" && "milestones" in response) {
+                    return response.milestones[0];
+                }
+                return response;
             },
             async update(projectId, phaseId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones/${phaseId}/`, z.object({ milestones: z.array(PhaseSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/milestones/${phaseId}`, z.object({ milestones: z.array(PhaseSchema) }), { method: "PUT", data });
                 return response.milestones[0];
             },
             async delete(projectId, phaseId) {
-                await request(`${basePath}/projects/${projectId}/milestones/${phaseId}/`, { method: "DELETE" });
+                await request(`${basePath}/projects/${projectId}/milestones/${phaseId}`, { method: "DELETE" });
             },
         },
         /**
@@ -855,10 +957,10 @@ export function createZohoProjectsClient(config) {
          */
         issues: {
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs/`, IssueListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs`, IssueListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.bugs, pageInfo: response.page_info };
@@ -867,25 +969,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(projectId, options));
             },
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             async get(projectId, issueId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs/${issueId}/`, z.object({ bugs: z.array(IssueSchema) }));
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs/${issueId}`, z.object({ bugs: z.array(IssueSchema) }));
                 if (response.bugs.length === 0) {
                     throw new ZohoProjectsError(`Issue not found: ${issueId}`, 404);
                 }
                 return response.bugs[0];
             },
             async create(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs/`, z.object({ bugs: z.array(IssueSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs`, z.object({ bugs: z.array(IssueSchema) }), { method: "POST", data });
                 return response.bugs[0];
             },
             async update(projectId, issueId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs/${issueId}/`, z.object({ bugs: z.array(IssueSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/bugs/${issueId}`, z.object({ bugs: z.array(IssueSchema) }), { method: "PUT", data });
                 return response.bugs[0];
             },
             async delete(projectId, issueId) {
-                await request(`${basePath}/projects/${projectId}/bugs/${issueId}/`, {
+                await request(`${basePath}/projects/${projectId}/bugs/${issueId}`, {
                     method: "DELETE",
                 });
             },
@@ -895,10 +997,10 @@ export function createZohoProjectsClient(config) {
          */
         forums: {
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums/`, ForumListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums`, ForumListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.forums, pageInfo: response.page_info };
@@ -907,25 +1009,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(projectId, options));
             },
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             async get(projectId, forumId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums/${forumId}/`, z.object({ forums: z.array(ForumSchema) }));
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums/${forumId}`, z.object({ forums: z.array(ForumSchema) }));
                 if (response.forums.length === 0) {
                     throw new ZohoProjectsError(`Forum not found: ${forumId}`, 404);
                 }
                 return response.forums[0];
             },
             async create(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums/`, z.object({ forums: z.array(ForumSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums`, z.object({ forums: z.array(ForumSchema) }), { method: "POST", data });
                 return response.forums[0];
             },
             async update(projectId, forumId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums/${forumId}/`, z.object({ forums: z.array(ForumSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/forums/${forumId}`, z.object({ forums: z.array(ForumSchema) }), { method: "PUT", data });
                 return response.forums[0];
             },
             async delete(projectId, forumId) {
-                await request(`${basePath}/projects/${projectId}/forums/${forumId}/`, {
+                await request(`${basePath}/projects/${projectId}/forums/${forumId}`, {
                     method: "DELETE",
                 });
             },
@@ -935,10 +1037,10 @@ export function createZohoProjectsClient(config) {
          */
         events: {
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events/`, EventListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events`, EventListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.events, pageInfo: response.page_info };
@@ -947,84 +1049,178 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(projectId, options));
             },
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             async get(projectId, eventId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events/${eventId}/`, z.object({ events: z.array(EventSchema) }));
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events/${eventId}`, z.object({ events: z.array(EventSchema) }));
                 if (response.events.length === 0) {
                     throw new ZohoProjectsError(`Event not found: ${eventId}`, 404);
                 }
                 return response.events[0];
             },
             async create(projectId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events/`, z.object({ events: z.array(EventSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events`, z.object({ events: z.array(EventSchema) }), { method: "POST", data });
                 return response.events[0];
             },
             async update(projectId, eventId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events/${eventId}/`, z.object({ events: z.array(EventSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/events/${eventId}`, z.object({ events: z.array(EventSchema) }), { method: "PUT", data });
                 return response.events[0];
             },
             async delete(projectId, eventId) {
-                await request(`${basePath}/projects/${projectId}/events/${eventId}/`, {
+                await request(`${basePath}/projects/${projectId}/events/${eventId}`, {
                     method: "DELETE",
                 });
             },
         },
         /**
          * Attachments API (project-scoped)
-         * Note: Upload requires multipart/form-data
+         * Note: V3 API requires entity_type and entity_id for listing
+         * Note: V3 Upload requires WorkDrive integration - use workdrive.upload() then associate()
          */
         attachments: {
-            async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/attachments/`, AttachmentListResponseSchema, {
+            /**
+             * List attachments for an entity (V3 API)
+             * Note: V3 requires entity_type and entity_id parameters
+             * @param projectId - Project ID
+             * @param params - List parameters including required entity_type and entity_id
+             */
+            async listForEntity(projectId, params) {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/attachments`, AttachmentListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        entity_type: params.entity_type,
+                        entity_id: params.entity_id,
+                        page: params.page ?? 1,
+                        per_page: params.per_page ?? DEFAULT_PAGE_SIZE,
                     },
                 });
-                return { data: response.attachments, pageInfo: response.page_info };
+                // Handle both V3 (attachment) and legacy (attachments) response formats
+                const attachments = "attachment" in response ? response.attachment : response.attachments;
+                return { data: attachments, pageInfo: response.page_info };
             },
-            async listAll(projectId, options) {
-                return collectAll(this.iterate(projectId, options));
+            /**
+             * List all attachments for an entity with auto-pagination
+             */
+            async listAllForEntity(projectId, params, options) {
+                return collectAll(this.iterateForEntity(projectId, params, options));
             },
-            iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+            /**
+             * Iterate over all attachments for an entity with auto-pagination
+             */
+            iterateForEntity(projectId, params, options) {
+                return autoPaginate((page, per_page) => this.listForEntity(projectId, { ...params, page, per_page }), options);
+            },
+            /**
+             * Convenience method: List attachments for a task
+             */
+            async listForTask(projectId, taskId, params) {
+                return this.listForEntity(projectId, {
+                    entity_type: "task",
+                    entity_id: taskId,
+                    ...params,
+                });
+            },
+            /**
+             * Convenience method: List attachments for a bug/issue
+             */
+            async listForIssue(projectId, issueId, params) {
+                return this.listForEntity(projectId, {
+                    entity_type: "bug",
+                    entity_id: issueId,
+                    ...params,
+                });
             },
             async get(projectId, attachmentId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/attachments/${attachmentId}/`, z.object({ attachments: z.array(AttachmentSchema) }));
-                if (response.attachments.length === 0) {
-                    throw new ZohoProjectsError(`Attachment not found: ${attachmentId}`, 404);
+                // V3 API may return attachment directly or wrapped
+                const schema = z.union([
+                    AttachmentSchema,
+                    z.object({ attachments: z.array(AttachmentSchema) }),
+                ]);
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/attachments/${attachmentId}`, schema);
+                if (response && typeof response === "object" && "attachments" in response) {
+                    const wrapped = response;
+                    if (wrapped.attachments.length === 0) {
+                        throw new ZohoProjectsError(`Attachment not found: ${attachmentId}`, 404);
+                    }
+                    return wrapped.attachments[0];
                 }
-                return response.attachments[0];
+                return response;
             },
             /**
-             * Upload an attachment
+             * Associate an existing attachment with an entity (V3 API)
+             * Use this after uploading a file to WorkDrive
              * @param projectId - Project ID
-             * @param file - File buffer or stream
-             * @param filename - Original filename
-             * @param options - Additional options
+             * @param attachmentId - Attachment ID (from WorkDrive upload)
+             * @param data - Entity association details
              */
-            async upload(projectId, file, filename, options) {
+            async associate(projectId, attachmentId, data) {
                 const FormData = (await import("form-data")).default;
                 const formData = new FormData();
-                formData.append("uploaddoc", file, filename);
-                if (options?.name)
-                    formData.append("name", options.name);
-                if (options?.description)
-                    formData.append("description", options.description);
-                if (options?.entity_type)
-                    formData.append("entity_type", options.entity_type);
-                if (options?.entity_id)
-                    formData.append("entity_id", options.entity_id);
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/attachments/`, z.object({ attachments: z.array(AttachmentSchema) }), {
+                formData.append("entity_type", data.entity_type);
+                formData.append("entity_id", data.entity_id);
+                await request(`${basePath}/projects/${projectId}/attachments/${attachmentId}`, {
+                    method: "POST",
+                    data: formData,
+                    headers: formData.getHeaders(),
+                });
+            },
+            /**
+             * Add attachments to an entity using attachment IDs (V3 API)
+             * @param projectId - Project ID
+             * @param entityType - Entity type (task, bug, forum)
+             * @param entityId - Entity ID
+             * @param data - Attachment IDs to add
+             */
+            async addToEntity(projectId, entityType, entityId, data) {
+                const FormData = (await import("form-data")).default;
+                const formData = new FormData();
+                formData.append("attachment_ids", JSON.stringify(data.attachment_ids));
+                await request(`${basePath}/module/${entityType}/entity/${entityId}/attachments`, {
                     method: "POST",
                     data: formData,
                     headers: formData.getHeaders(),
                 });
-                return response.attachments[0];
             },
             async delete(projectId, attachmentId) {
-                await request(`${basePath}/projects/${projectId}/attachments/${attachmentId}/`, { method: "DELETE" });
+                await request(`${basePath}/projects/${projectId}/attachments/${attachmentId}`, { method: "DELETE" });
+            },
+        },
+        /**
+         * WorkDrive API for file uploads
+         * V3 attachments require uploading to WorkDrive first, then associating with entities
+         */
+        workdrive: {
+            /**
+             * Upload a file to WorkDrive
+             * After uploading, use attachments.associate() to link to a task/issue
+             * @param file - File buffer or stream
+             * @param filename - Original filename
+             * @param options - Upload options including parent_id (folder ID)
+             * @returns WorkDrive file object with ID to use for association
+             */
+            async upload(file, filename, options) {
+                const FormData = (await import("form-data")).default;
+                const formData = new FormData();
+                formData.append("content", file, {
+                    filename: options.filename ?? filename,
+                    contentType: "application/octet-stream",
+                });
+                formData.append("parent_id", options.parent_id);
+                if (options.override_name_exist !== undefined) {
+                    formData.append("override-name-exist", options.override_name_exist.toString());
+                }
+                // WorkDrive has its own API base URL
+                const workdriveUrl = apiUrl.replace("projectsapi", "workdrive");
+                const token = await tokenManager.getValidToken();
+                const response = await httpClient.post(`${workdriveUrl}/api/v1/upload`, formData, {
+                    headers: {
+                        ...formData.getHeaders(),
+                        Authorization: `Zoho-oauthtoken ${token}`,
+                    },
+                });
+                if (!response.data.data || response.data.data.length === 0) {
+                    throw new ZohoProjectsError("WorkDrive upload returned no data");
+                }
+                return response.data.data[0];
             },
         },
         /**
@@ -1032,10 +1228,10 @@ export function createZohoProjectsClient(config) {
          */
         documents: {
             async list(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents/`, DocumentListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents`, DocumentListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                         folder_id: params?.folder_id,
                     },
                 });
@@ -1045,10 +1241,10 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(projectId, options));
             },
             iterate(projectId, options) {
-                return autoPaginate((index, range) => this.list(projectId, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(projectId, { page, per_page }), options);
             },
             async get(projectId, documentId) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents/${documentId}/`, z.object({ documents: z.array(DocumentSchema) }));
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents/${documentId}`, z.object({ documents: z.array(DocumentSchema) }));
                 if (response.documents.length === 0) {
                     throw new ZohoProjectsError(`Document not found: ${documentId}`, 404);
                 }
@@ -1067,7 +1263,7 @@ export function createZohoProjectsClient(config) {
                     formData.append("description", options.description);
                 if (options?.folder_id)
                     formData.append("folder_id", options.folder_id);
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents/`, z.object({ documents: z.array(DocumentSchema) }), {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents`, z.object({ documents: z.array(DocumentSchema) }), {
                     method: "POST",
                     data: formData,
                     headers: formData.getHeaders(),
@@ -1075,25 +1271,25 @@ export function createZohoProjectsClient(config) {
                 return response.documents[0];
             },
             async update(projectId, documentId, data) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents/${documentId}/`, z.object({ documents: z.array(DocumentSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/documents/${documentId}`, z.object({ documents: z.array(DocumentSchema) }), { method: "PUT", data });
                 return response.documents[0];
             },
             async delete(projectId, documentId) {
-                await request(`${basePath}/projects/${projectId}/documents/${documentId}/`, { method: "DELETE" });
+                await request(`${basePath}/projects/${projectId}/documents/${documentId}`, { method: "DELETE" });
             },
             // Folder operations
             folders: {
                 async list(projectId, params) {
                     const response = await requestWithValidation(`${basePath}/projects/${projectId}/folders/`, DocumentFolderListResponseSchema, {
                         params: {
-                            index: params?.index ?? 0,
-                            range: params?.range ?? DEFAULT_PAGE_SIZE,
+                            page: params?.page ?? params?.index ?? 1,
+                            per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                         },
                     });
                     return { data: response.folders, pageInfo: response.page_info };
                 },
                 async get(projectId, folderId) {
-                    const response = await requestWithValidation(`${basePath}/projects/${projectId}/folders/${folderId}/`, z.object({ folders: z.array(DocumentFolderSchema) }));
+                    const response = await requestWithValidation(`${basePath}/projects/${projectId}/folders/${folderId}`, z.object({ folders: z.array(DocumentFolderSchema) }));
                     if (response.folders.length === 0) {
                         throw new ZohoProjectsError(`Folder not found: ${folderId}`, 404);
                     }
@@ -1104,11 +1300,11 @@ export function createZohoProjectsClient(config) {
                     return response.folders[0];
                 },
                 async update(projectId, folderId, data) {
-                    const response = await requestWithValidation(`${basePath}/projects/${projectId}/folders/${folderId}/`, z.object({ folders: z.array(DocumentFolderSchema) }), { method: "PUT", data });
+                    const response = await requestWithValidation(`${basePath}/projects/${projectId}/folders/${folderId}`, z.object({ folders: z.array(DocumentFolderSchema) }), { method: "PUT", data });
                     return response.folders[0];
                 },
                 async delete(projectId, folderId) {
-                    await request(`${basePath}/projects/${projectId}/folders/${folderId}/`, { method: "DELETE" });
+                    await request(`${basePath}/projects/${projectId}/folders/${folderId}`, { method: "DELETE" });
                 },
             },
         },
@@ -1154,10 +1350,10 @@ export function createZohoProjectsClient(config) {
                 const commentsPath = `${basePath}/projects/${projectId}/${entityType}/${entityId}/comments`;
                 return {
                     async list(params) {
-                        const response = await requestWithValidation(`${commentsPath}/`, CommentListResponseSchema, {
+                        const response = await requestWithValidation(`${commentsPath}`, CommentListResponseSchema, {
                             params: {
-                                index: params?.index ?? 0,
-                                range: params?.range ?? DEFAULT_PAGE_SIZE,
+                                page: params?.page ?? params?.index ?? 1,
+                                per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                             },
                         });
                         return { data: response.comments, pageInfo: response.page_info };
@@ -1166,25 +1362,25 @@ export function createZohoProjectsClient(config) {
                         return collectAll(this.iterate(options));
                     },
                     iterate(options) {
-                        return autoPaginate((index, range) => this.list({ index, range }), options);
+                        return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
                     },
                     async get(commentId) {
-                        const response = await requestWithValidation(`${commentsPath}/${commentId}/`, z.object({ comments: z.array(CommentSchema) }));
+                        const response = await requestWithValidation(`${commentsPath}/${commentId}`, z.object({ comments: z.array(CommentSchema) }));
                         if (response.comments.length === 0) {
                             throw new ZohoProjectsError(`Comment not found: ${commentId}`, 404);
                         }
                         return response.comments[0];
                     },
                     async create(data) {
-                        const response = await requestWithValidation(`${commentsPath}/`, z.object({ comments: z.array(CommentSchema) }), { method: "POST", data });
+                        const response = await requestWithValidation(`${commentsPath}`, z.object({ comments: z.array(CommentSchema) }), { method: "POST", data });
                         return response.comments[0];
                     },
                     async update(commentId, data) {
-                        const response = await requestWithValidation(`${commentsPath}/${commentId}/`, z.object({ comments: z.array(CommentSchema) }), { method: "PUT", data });
+                        const response = await requestWithValidation(`${commentsPath}/${commentId}`, z.object({ comments: z.array(CommentSchema) }), { method: "PUT", data });
                         return response.comments[0];
                     },
                     async delete(commentId) {
-                        await request(`${commentsPath}/${commentId}/`, {
+                        await request(`${commentsPath}/${commentId}`, {
                             method: "DELETE",
                         });
                     },
@@ -1233,10 +1429,10 @@ export function createZohoProjectsClient(config) {
                 const followersPath = `${basePath}/projects/${projectId}/${entityType}/${entityId}/followers`;
                 return {
                     async list(params) {
-                        const response = await requestWithValidation(`${followersPath}/`, FollowerListResponseSchema, {
+                        const response = await requestWithValidation(`${followersPath}`, FollowerListResponseSchema, {
                             params: {
-                                index: params?.index ?? 0,
-                                range: params?.range ?? DEFAULT_PAGE_SIZE,
+                                page: params?.page ?? params?.index ?? 1,
+                                per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                             },
                         });
                         return { data: response.followers, pageInfo: response.page_info };
@@ -1245,14 +1441,14 @@ export function createZohoProjectsClient(config) {
                         return collectAll(this.iterate(options));
                     },
                     iterate(options) {
-                        return autoPaginate((index, range) => this.list({ index, range }), options);
+                        return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
                     },
                     async add(data) {
-                        const response = await requestWithValidation(`${followersPath}/`, z.object({ followers: z.array(FollowerSchema) }), { method: "POST", data });
+                        const response = await requestWithValidation(`${followersPath}`, z.object({ followers: z.array(FollowerSchema) }), { method: "POST", data });
                         return response.followers;
                     },
                     async remove(userId) {
-                        await request(`${followersPath}/${userId}/`, {
+                        await request(`${followersPath}/${userId}`, {
                             method: "DELETE",
                         });
                     },
@@ -1280,10 +1476,10 @@ export function createZohoProjectsClient(config) {
          */
         dashboards: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/dashboards/`, DashboardListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/dashboards`, DashboardListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.dashboards, pageInfo: response.page_info };
@@ -1292,25 +1488,25 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(dashboardId) {
-                const response = await requestWithValidation(`${basePath}/dashboards/${dashboardId}/`, z.object({ dashboards: z.array(DashboardSchema) }));
+                const response = await requestWithValidation(`${basePath}/dashboards/${dashboardId}`, z.object({ dashboards: z.array(DashboardSchema) }));
                 if (response.dashboards.length === 0) {
                     throw new ZohoProjectsError(`Dashboard not found: ${dashboardId}`, 404);
                 }
                 return response.dashboards[0];
             },
             async create(data) {
-                const response = await requestWithValidation(`${basePath}/dashboards/`, z.object({ dashboards: z.array(DashboardSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/dashboards`, z.object({ dashboards: z.array(DashboardSchema) }), { method: "POST", data });
                 return response.dashboards[0];
             },
             async update(dashboardId, data) {
-                const response = await requestWithValidation(`${basePath}/dashboards/${dashboardId}/`, z.object({ dashboards: z.array(DashboardSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/dashboards/${dashboardId}`, z.object({ dashboards: z.array(DashboardSchema) }), { method: "PUT", data });
                 return response.dashboards[0];
             },
             async delete(dashboardId) {
-                await request(`${basePath}/dashboards/${dashboardId}/`, {
+                await request(`${basePath}/dashboards/${dashboardId}`, {
                     method: "DELETE",
                 });
             },
@@ -1321,10 +1517,10 @@ export function createZohoProjectsClient(config) {
                 const widgetsPath = `${basePath}/dashboards/${dashboardId}/widgets`;
                 return {
                     async list(params) {
-                        const response = await requestWithValidation(`${widgetsPath}/`, WidgetListResponseSchema, {
+                        const response = await requestWithValidation(`${widgetsPath}`, WidgetListResponseSchema, {
                             params: {
-                                index: params?.index ?? 0,
-                                range: params?.range ?? DEFAULT_PAGE_SIZE,
+                                page: params?.page ?? params?.index ?? 1,
+                                per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                             },
                         });
                         return { data: response.widgets, pageInfo: response.page_info };
@@ -1333,25 +1529,25 @@ export function createZohoProjectsClient(config) {
                         return collectAll(this.iterate(options));
                     },
                     iterate(options) {
-                        return autoPaginate((index, range) => this.list({ index, range }), options);
+                        return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
                     },
                     async get(widgetId) {
-                        const response = await requestWithValidation(`${widgetsPath}/${widgetId}/`, z.object({ widgets: z.array(WidgetSchema) }));
+                        const response = await requestWithValidation(`${widgetsPath}/${widgetId}`, z.object({ widgets: z.array(WidgetSchema) }));
                         if (response.widgets.length === 0) {
                             throw new ZohoProjectsError(`Widget not found: ${widgetId}`, 404);
                         }
                         return response.widgets[0];
                     },
                     async create(data) {
-                        const response = await requestWithValidation(`${widgetsPath}/`, z.object({ widgets: z.array(WidgetSchema) }), { method: "POST", data });
+                        const response = await requestWithValidation(`${widgetsPath}`, z.object({ widgets: z.array(WidgetSchema) }), { method: "POST", data });
                         return response.widgets[0];
                     },
                     async update(widgetId, data) {
-                        const response = await requestWithValidation(`${widgetsPath}/${widgetId}/`, z.object({ widgets: z.array(WidgetSchema) }), { method: "PUT", data });
+                        const response = await requestWithValidation(`${widgetsPath}/${widgetId}`, z.object({ widgets: z.array(WidgetSchema) }), { method: "PUT", data });
                         return response.widgets[0];
                     },
                     async delete(widgetId) {
-                        await request(`${widgetsPath}/${widgetId}/`, {
+                        await request(`${widgetsPath}/${widgetId}`, {
                             method: "DELETE",
                         });
                     },
@@ -1364,10 +1560,10 @@ export function createZohoProjectsClient(config) {
          */
         reports: {
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/reports/`, ReportListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/reports`, ReportListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.reports, pageInfo: response.page_info };
@@ -1376,10 +1572,10 @@ export function createZohoProjectsClient(config) {
                 return collectAll(this.iterate(options));
             },
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             async get(reportId) {
-                const response = await requestWithValidation(`${basePath}/reports/${reportId}/`, z.object({ reports: z.array(ReportSchema) }));
+                const response = await requestWithValidation(`${basePath}/reports/${reportId}`, z.object({ reports: z.array(ReportSchema) }));
                 if (response.reports.length === 0) {
                     throw new ZohoProjectsError(`Report not found: ${reportId}`, 404);
                 }
@@ -1406,10 +1602,10 @@ export function createZohoProjectsClient(config) {
              * List reports for a specific project
              */
             async listForProject(projectId, params) {
-                const response = await requestWithValidation(`${basePath}/projects/${projectId}/reports/`, ReportListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/projects/${projectId}/reports`, ReportListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.reports, pageInfo: response.page_info };
@@ -1424,7 +1620,7 @@ export function createZohoProjectsClient(config) {
              * Search across all entities
              */
             async query(query) {
-                const response = await requestWithValidation(`${basePath}/search/`, SearchResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/search`, SearchResponseSchema, {
                     params: {
                         search_term: query.search_term,
                         entity_type: query.entity_type,
@@ -1486,13 +1682,13 @@ export function createZohoProjectsClient(config) {
              * List items in trash
              */
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/trash/`, TrashListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/trash`, TrashListResponseSchema, {
                     params: {
                         entity_type: params?.entity_type,
                         project_id: params?.project_id,
                         deleted_by: params?.deleted_by,
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 const items = response.trash || response.deleted_items || [];
@@ -1508,7 +1704,7 @@ export function createZohoProjectsClient(config) {
              * Iterate over all trash items with auto-pagination
              */
             iterate(params, options) {
-                return autoPaginate((index, range) => this.list({ ...params, index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ ...params, page, per_page }), options);
             },
             /**
              * Restore an item from trash
@@ -1521,7 +1717,7 @@ export function createZohoProjectsClient(config) {
              * Permanently delete an item from trash
              */
             async permanentDelete(entityType, itemId) {
-                await request(`${basePath}/trash/${entityType}/${itemId}/`, {
+                await request(`${basePath}/trash/${entityType}/${itemId}`, {
                     method: "DELETE",
                 });
             },
@@ -1530,8 +1726,8 @@ export function createZohoProjectsClient(config) {
              */
             async empty(entityType) {
                 const path = entityType
-                    ? `${basePath}/trash/${entityType}/`
-                    : `${basePath}/trash/`;
+                    ? `${basePath}/trash/${entityType}`
+                    : `${basePath}/trash`;
                 await request(path, { method: "DELETE" });
             },
             /**
@@ -1557,7 +1753,7 @@ export function createZohoProjectsClient(config) {
              * Get a specific portal by ID
              */
             async get(portalId) {
-                const response = await requestWithValidation(`/restapi/portals/${portalId}/`, z.object({ portals: z.array(PortalSchema) }));
+                const response = await requestWithValidation(`/restapi/portals/${portalId}`, z.object({ portals: z.array(PortalSchema) }));
                 if (response.portals.length === 0) {
                     throw new ZohoProjectsError(`Portal not found: ${portalId}`, 404);
                 }
@@ -1579,7 +1775,7 @@ export function createZohoProjectsClient(config) {
              * List all modules in the portal
              */
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/settings/modules/`, ModuleListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/settings/modules`, ModuleListResponseSchema, {
                     params: {
                         is_customized: params?.is_customized,
                         is_default: params?.is_default,
@@ -1592,7 +1788,7 @@ export function createZohoProjectsClient(config) {
              * Get a specific module by ID
              */
             async get(moduleId) {
-                const response = await requestWithValidation(`${basePath}/settings/modules/${moduleId}/`, z.object({ modules: z.array(ModuleSchema) }));
+                const response = await requestWithValidation(`${basePath}/settings/modules/${moduleId}`, z.object({ modules: z.array(ModuleSchema) }));
                 if (response.modules.length === 0) {
                     throw new ZohoProjectsError(`Module not found: ${moduleId}`, 404);
                 }
@@ -1609,7 +1805,7 @@ export function createZohoProjectsClient(config) {
              * Get a specific field definition
              */
             async getField(moduleId, fieldId) {
-                const response = await requestWithValidation(`${basePath}/settings/modules/${moduleId}/fields/${fieldId}/`, z.object({ fields: z.array(ModuleFieldSchema) }));
+                const response = await requestWithValidation(`${basePath}/settings/modules/${moduleId}/fields/${fieldId}`, z.object({ fields: z.array(ModuleFieldSchema) }));
                 if (response.fields.length === 0) {
                     throw new ZohoProjectsError(`Field not found: ${fieldId}`, 404);
                 }
@@ -1766,10 +1962,10 @@ export function createZohoProjectsClient(config) {
              * List custom views for a specific entity type
              */
             async list(entityType, params) {
-                const response = await requestWithValidation(`${basePath}/${entityType}/customviews/`, CustomViewListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/${entityType}/customviews`, CustomViewListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.customviews, pageInfo: response.page_info };
@@ -1784,13 +1980,13 @@ export function createZohoProjectsClient(config) {
              * Iterate over all custom views with auto-pagination
              */
             iterate(entityType, options) {
-                return autoPaginate((index, range) => this.list(entityType, { index, range }), options);
+                return autoPaginate((page, per_page) => this.list(entityType, { page, per_page }), options);
             },
             /**
              * Get a specific custom view
              */
             async get(entityType, viewId) {
-                const response = await requestWithValidation(`${basePath}/${entityType}/customviews/${viewId}/`, z.object({ customviews: z.array(CustomViewSchema) }));
+                const response = await requestWithValidation(`${basePath}/${entityType}/customviews/${viewId}`, z.object({ customviews: z.array(CustomViewSchema) }));
                 if (response.customviews.length === 0) {
                     throw new ZohoProjectsError(`Custom view not found: ${viewId}`, 404);
                 }
@@ -1800,21 +1996,21 @@ export function createZohoProjectsClient(config) {
              * Create a custom view
              */
             async create(entityType, data) {
-                const response = await requestWithValidation(`${basePath}/${entityType}/customviews/`, z.object({ customviews: z.array(CustomViewSchema) }), { method: "POST", data });
+                const response = await requestWithValidation(`${basePath}/${entityType}/customviews`, z.object({ customviews: z.array(CustomViewSchema) }), { method: "POST", data });
                 return response.customviews[0];
             },
             /**
              * Update a custom view
              */
             async update(entityType, viewId, data) {
-                const response = await requestWithValidation(`${basePath}/${entityType}/customviews/${viewId}/`, z.object({ customviews: z.array(CustomViewSchema) }), { method: "PUT", data });
+                const response = await requestWithValidation(`${basePath}/${entityType}/customviews/${viewId}`, z.object({ customviews: z.array(CustomViewSchema) }), { method: "PUT", data });
                 return response.customviews[0];
             },
             /**
              * Delete a custom view
              */
             async delete(entityType, viewId) {
-                await request(`${basePath}/${entityType}/customviews/${viewId}/`, {
+                await request(`${basePath}/${entityType}/customviews/${viewId}`, {
                     method: "DELETE",
                 });
             },
@@ -1870,10 +2066,10 @@ export function createZohoProjectsClient(config) {
              * List all blueprints
              */
             async list(params) {
-                const response = await requestWithValidation(`${basePath}/settings/blueprints/`, BlueprintListResponseSchema, {
+                const response = await requestWithValidation(`${basePath}/settings/blueprints`, BlueprintListResponseSchema, {
                     params: {
-                        index: params?.index ?? 0,
-                        range: params?.range ?? DEFAULT_PAGE_SIZE,
+                        page: params?.page ?? params?.index ?? 1,
+                        per_page: params?.per_page ?? params?.range ?? DEFAULT_PAGE_SIZE,
                     },
                 });
                 return { data: response.blueprints, pageInfo: response.page_info };
@@ -1888,13 +2084,13 @@ export function createZohoProjectsClient(config) {
              * Iterate over all blueprints with auto-pagination
              */
             iterate(options) {
-                return autoPaginate((index, range) => this.list({ index, range }), options);
+                return autoPaginate((page, per_page) => this.list({ page, per_page }), options);
             },
             /**
              * Get a specific blueprint
              */
             async get(blueprintId) {
-                const response = await requestWithValidation(`${basePath}/settings/blueprints/${blueprintId}/`, z.object({ blueprints: z.array(BlueprintSchema) }));
+                const response = await requestWithValidation(`${basePath}/settings/blueprints/${blueprintId}`, z.object({ blueprints: z.array(BlueprintSchema) }));
                 if (response.blueprints.length === 0) {
                     throw new ZohoProjectsError(`Blueprint not found: ${blueprintId}`, 404);
                 }
@@ -1921,7 +2117,7 @@ export function createZohoProjectsClient(config) {
              */
             async executeTransition(projectId, moduleType, transitionId, data) {
                 const modulePath = moduleType === "Task" ? "tasks" : "bugs";
-                await request(`${basePath}/projects/${projectId}/${modulePath}/${data.entity_id}/transitions/${transitionId}/`, {
+                await request(`${basePath}/projects/${projectId}/${modulePath}/${data.entity_id}/transitions/${transitionId}`, {
                     method: "POST",
                     data: {
                         skip_bug_validation: data.skip_bug_validation,