Merge pull request #34 from nkaewam/main

feat: support search by branch for get_merge_request

index.ts

@@ -8,9 +8,9 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import FormData from "form-data";
 import fetch from "node-fetch";
-import { SocksProxyAgent } from 'socks-proxy-agent';
+import { SocksProxyAgent } from "socks-proxy-agent";
-import { HttpsProxyAgent } from 'https-proxy-agent';
+import { HttpsProxyAgent } from "https-proxy-agent";
-import { HttpProxyAgent } from 'http-proxy-agent';
+import { HttpProxyAgent } from "http-proxy-agent";
 import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import { fileURLToPath } from "url";
@@ -19,8 +19,8 @@ import fs from "fs";
 import path from "path";
 
 // Add type imports for proxy agents
-import { Agent } from 'http';
+import { Agent } from "http";
-import { URL } from 'url';
+import { URL } from "url";
 
 import {
   GitLabForkSchema,
@@ -156,14 +156,14 @@ let httpAgent: Agent | undefined = undefined;
 let httpsAgent: Agent | undefined = undefined;
 
 if (HTTP_PROXY) {
-  if (HTTP_PROXY.startsWith('socks')) {
+  if (HTTP_PROXY.startsWith("socks")) {
     httpAgent = new SocksProxyAgent(HTTP_PROXY);
   } else {
     httpAgent = new HttpProxyAgent(HTTP_PROXY);
   }
 }
 if (HTTPS_PROXY) {
-  if (HTTPS_PROXY.startsWith('socks')) {
+  if (HTTPS_PROXY.startsWith("socks")) {
     httpsAgent = new SocksProxyAgent(HTTPS_PROXY);
   } else {
     httpsAgent = new HttpsProxyAgent(HTTPS_PROXY);
@@ -181,11 +181,11 @@ const DEFAULT_HEADERS = {
 const DEFAULT_FETCH_CONFIG = {
   headers: DEFAULT_HEADERS,
   agent: (parsedUrl: URL) => {
-    if (parsedUrl.protocol === 'https:') {
+    if (parsedUrl.protocol === "https:") {
       return httpsAgent;
     }
     return httpAgent;
-  }
+  },
 };
 
 // Define all available tools
@@ -238,17 +238,20 @@ const allTools = [
   },
   {
     name: "get_merge_request",
-    description: "Get details of a merge request",
+    description:
+      "Get details of a merge request (Either mergeRequestIid or branchName must be provided)",
     inputSchema: zodToJsonSchema(GetMergeRequestSchema),
   },
   {
     name: "get_merge_request_diffs",
-    description: "Get the changes/diffs of a merge request",
+    description:
+      "Get the changes/diffs of a merge request (Either mergeRequestIid or branchName must be provided)",
     inputSchema: zodToJsonSchema(GetMergeRequestDiffsSchema),
   },
   {
     name: "update_merge_request",
-    description: "Update a merge request",
+    description:
+      "Update a merge request (Either mergeRequestIid or branchName must be provided)",
     inputSchema: zodToJsonSchema(UpdateMergeRequestSchema),
   },
   {
@@ -385,7 +388,7 @@ const allTools = [
     name: "delete_wiki_page",
     description: "Delete a wiki page from a GitLab project",
     inputSchema: zodToJsonSchema(DeleteWikiPageSchema),
-  }
+  },
 ];
 
 // Define which tools are read-only
@@ -466,17 +469,18 @@ async function handleGitLabError(
   if (!response.ok) {
     const errorBody = await response.text();
     // Check specifically for Rate Limit error
-    if (response.status === 403 && errorBody.includes("User API Key Rate limit exceeded")) {
+    if (
-        console.error("GitLab API Rate Limit Exceeded:", errorBody);
+      response.status === 403 &&
-        console.log("User API Key Rate limit exceeded. Please try again later.");
+      errorBody.includes("User API Key Rate limit exceeded")
-        throw new Error(
+    ) {
-          `GitLab API Rate Limit Exceeded: ${errorBody}`
+      console.error("GitLab API Rate Limit Exceeded:", errorBody);
-        );
+      console.log("User API Key Rate limit exceeded. Please try again later.");
+      throw new Error(`GitLab API Rate Limit Exceeded: ${errorBody}`);
     } else {
-        // Handle other API errors
+      // Handle other API errors
-        throw new Error(
+      throw new Error(
-          `GitLab API error: ${response.status} ${response.statusText}\n${errorBody}`
+        `GitLab API error: ${response.status} ${response.statusText}\n${errorBody}`
-        );
+      );
     }
   }
 }
@@ -1303,25 +1307,47 @@ async function createRepository(
  * MR 조회 함수 (Function to retrieve merge request)
  *
  * @param {string} projectId - The ID or URL-encoded path of the project
- * @param {number} mergeRequestIid - The internal ID of the merge request
+ * @param {number} mergeRequestIid - The internal ID of the merge request (Optional)
+ * @param {string} [branchName] - The name of the branch to search for merge request by branch name (Optional)
  * @returns {Promise<GitLabMergeRequest>} The merge request details
  */
 async function getMergeRequest(
   projectId: string,
-  mergeRequestIid: number
+  mergeRequestIid?: number,
+  branchName?: string
 ): Promise<GitLabMergeRequest> {
-  const url = new URL(
+  let url: URL;
-    `${GITLAB_API_URL}/projects/${encodeURIComponent(
+
-      projectId
+  if (mergeRequestIid) {
-    )}/merge_requests/${mergeRequestIid}`
+    url = new URL(
-  );
+      `${GITLAB_API_URL}/projects/${encodeURIComponent(
+        projectId
+      )}/merge_requests/${mergeRequestIid}`
+    );
+  } else if (branchName) {
+    url = new URL(
+      `${GITLAB_API_URL}/projects/${encodeURIComponent(
+        projectId
+      )}/merge_requests?source_branch=${encodeURIComponent(branchName)}`
+    );
+  } else {
+    throw new Error("Either mergeRequestIid or branchName must be provided");
+  }
 
   const response = await fetch(url.toString(), {
     ...DEFAULT_FETCH_CONFIG,
   });
 
   await handleGitLabError(response);
-  return GitLabMergeRequestSchema.parse(await response.json());
+
+  const data = await response.json();
+
+  // If response is an array (Comes from branchName search), return the first item if exist
+  if (Array.isArray(data) && data.length > 0) {
+    return GitLabMergeRequestSchema.parse(data[0]);
+  }
+
+  return GitLabMergeRequestSchema.parse(data);
 }
 
 /**
@@ -1329,15 +1355,30 @@ async function getMergeRequest(
  * MR 변경사항 조회 함수 (Function to retrieve merge request changes)
  *
  * @param {string} projectId - The ID or URL-encoded path of the project
- * @param {number} mergeRequestIid - The internal ID of the merge request
+ * @param {number} mergeRequestIid - The internal ID of the merge request (Either mergeRequestIid or branchName must be provided)
+ * @param {string} [branchName] - The name of the branch to search for merge request by branch name (Either mergeRequestIid or branchName must be provided)
  * @param {string} [view] - The view type for the diff (inline or parallel)
  * @returns {Promise<GitLabMergeRequestDiff[]>} The merge request diffs
  */
 async function getMergeRequestDiffs(
   projectId: string,
-  mergeRequestIid: number,
+  mergeRequestIid?: number,
+  branchName?: string,
   view?: "inline" | "parallel"
 ): Promise<GitLabMergeRequestDiff[]> {
+  if (!mergeRequestIid && !branchName) {
+    throw new Error("Either mergeRequestIid or branchName must be provided");
+  }
+
+  if (branchName && !mergeRequestIid) {
+    const mergeRequest = await getMergeRequest(
+      projectId,
+      undefined,
+      branchName
+    );
+    mergeRequestIid = mergeRequest.iid;
+  }
+
   const url = new URL(
     `${GITLAB_API_URL}/projects/${encodeURIComponent(
       projectId
@@ -1362,18 +1403,33 @@ async function getMergeRequestDiffs(
  * MR 업데이트 함수 (Function to update merge request)
  *
  * @param {string} projectId - The ID or URL-encoded path of the project
- * @param {number} mergeRequestIid - The internal ID of the merge request
+ * @param {number} mergeRequestIid - The internal ID of the merge request (Optional)
+ * @param {string} branchName - The name of the branch to search for merge request by branch name (Optional)
  * @param {Object} options - The update options
  * @returns {Promise<GitLabMergeRequest>} The updated merge request
  */
 async function updateMergeRequest(
   projectId: string,
-  mergeRequestIid: number,
   options: Omit<
     z.infer<typeof UpdateMergeRequestSchema>,
-    "project_id" | "merge_request_iid"
+    "project_id" | "merge_request_iid" | "source_branch"
-  >
+  >,
+  mergeRequestIid?: number,
+  branchName?: string
 ): Promise<GitLabMergeRequest> {
+  if (!mergeRequestIid && !branchName) {
+    throw new Error("Either mergeRequestIid or branchName must be provided");
+  }
+
+  if (branchName && !mergeRequestIid) {
+    const mergeRequest = await getMergeRequest(
+      projectId,
+      undefined,
+      branchName
+    );
+    mergeRequestIid = mergeRequest.iid;
+  }
+
   const url = new URL(
     `${GITLAB_API_URL}/projects/${encodeURIComponent(
       projectId
@@ -1841,13 +1897,14 @@ async function listGroupProjects(
  */
 async function listWikiPages(
   projectId: string,
-  options: Omit<z.infer<typeof ListWikiPagesSchema>, 'project_id'> = {}
+  options: Omit<z.infer<typeof ListWikiPagesSchema>, "project_id"> = {}
 ): Promise<GitLabWikiPage[]> {
   const url = new URL(
     `${GITLAB_API_URL}/projects/${encodeURIComponent(projectId)}/wikis`
   );
-  if (options.page) url.searchParams.append('page', options.page.toString());
+  if (options.page) url.searchParams.append("page", options.page.toString());
-  if (options.per_page) url.searchParams.append('per_page', options.per_page.toString());
+  if (options.per_page)
+    url.searchParams.append("per_page", options.per_page.toString());
   const response = await fetch(url.toString(), {
     ...DEFAULT_FETCH_CONFIG,
   });
@@ -1864,9 +1921,9 @@ async function getWikiPage(
   slug: string
 ): Promise<GitLabWikiPage> {
   const response = await fetch(
-    `${GITLAB_API_URL}/projects/${encodeURIComponent(projectId)}/wikis/${encodeURIComponent(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
-      slug
+      projectId
-    )}`,
+    )}/wikis/${encodeURIComponent(slug)}`,
     { ...DEFAULT_FETCH_CONFIG }
   );
   await handleGitLabError(response);
@@ -1889,7 +1946,7 @@ async function createWikiPage(
     `${GITLAB_API_URL}/projects/${encodeURIComponent(projectId)}/wikis`,
     {
       ...DEFAULT_FETCH_CONFIG,
-      method: 'POST',
+      method: "POST",
       body: JSON.stringify(body),
     }
   );
@@ -1913,12 +1970,12 @@ async function updateWikiPage(
   if (content) body.content = content;
   if (format) body.format = format;
   const response = await fetch(
-    `${GITLAB_API_URL}/projects/${encodeURIComponent(projectId)}/wikis/${encodeURIComponent(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
-      slug
+      projectId
-    )}`,
+    )}/wikis/${encodeURIComponent(slug)}`,
     {
       ...DEFAULT_FETCH_CONFIG,
-      method: 'PUT',
+      method: "PUT",
       body: JSON.stringify(body),
     }
   );
@@ -1930,17 +1987,14 @@ async function updateWikiPage(
 /**
  * Delete a wiki page
  */
-async function deleteWikiPage(
+async function deleteWikiPage(projectId: string, slug: string): Promise<void> {
-  projectId: string,
-  slug: string
-): Promise<void> {
   const response = await fetch(
-    `${GITLAB_API_URL}/projects/${encodeURIComponent(projectId)}/wikis/${encodeURIComponent(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
-      slug
+      projectId
-    )}`,
+    )}/wikis/${encodeURIComponent(slug)}`,
     {
       ...DEFAULT_FETCH_CONFIG,
-      method: 'DELETE',
+      method: "DELETE",
     }
   );
   await handleGitLabError(response);
@@ -2119,7 +2173,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const args = GetMergeRequestSchema.parse(request.params.arguments);
         const mergeRequest = await getMergeRequest(
           args.project_id,
-          args.merge_request_iid
+          args.merge_request_iid,
+          args.source_branch
         );
         return {
           content: [
@@ -2133,6 +2188,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const diffs = await getMergeRequestDiffs(
           args.project_id,
           args.merge_request_iid,
+          args.source_branch,
           args.view
         );
         return {
@@ -2142,11 +2198,13 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
       case "update_merge_request": {
         const args = UpdateMergeRequestSchema.parse(request.params.arguments);
-        const { project_id, merge_request_iid, ...options } = args;
+        const { project_id, merge_request_iid, source_branch, ...options } =
+          args;
         const mergeRequest = await updateMergeRequest(
           project_id,
+          options,
           merge_request_iid,
-          options
+          source_branch
         );
         return {
           content: [
@@ -2451,33 +2509,74 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
 
       case "list_wiki_pages": {
-        const { project_id, page, per_page } = ListWikiPagesSchema.parse(request.params.arguments);
+        const { project_id, page, per_page } = ListWikiPagesSchema.parse(
+          request.params.arguments
+        );
         const wikiPages = await listWikiPages(project_id, { page, per_page });
-        return { content: [{ type: "text", text: JSON.stringify(wikiPages, null, 2) }] };
+        return {
+          content: [{ type: "text", text: JSON.stringify(wikiPages, null, 2) }],
+        };
       }
 
       case "get_wiki_page": {
-        const { project_id, slug } = GetWikiPageSchema.parse(request.params.arguments);
+        const { project_id, slug } = GetWikiPageSchema.parse(
+          request.params.arguments
+        );
         const wikiPage = await getWikiPage(project_id, slug);
-        return { content: [{ type: "text", text: JSON.stringify(wikiPage, null, 2) }] };
+        return {
+          content: [{ type: "text", text: JSON.stringify(wikiPage, null, 2) }],
+        };
       }
 
       case "create_wiki_page": {
-        const { project_id, title, content, format } = CreateWikiPageSchema.parse(request.params.arguments);
+        const { project_id, title, content, format } =
-        const wikiPage = await createWikiPage(project_id, title, content, format);
+          CreateWikiPageSchema.parse(request.params.arguments);
-        return { content: [{ type: "text", text: JSON.stringify(wikiPage, null, 2) }] };
+        const wikiPage = await createWikiPage(
+          project_id,
+          title,
+          content,
+          format
+        );
+        return {
+          content: [{ type: "text", text: JSON.stringify(wikiPage, null, 2) }],
+        };
       }
 
       case "update_wiki_page": {
-        const { project_id, slug, title, content, format } = UpdateWikiPageSchema.parse(request.params.arguments);
+        const { project_id, slug, title, content, format } =
-        const wikiPage = await updateWikiPage(project_id, slug, title, content, format);
+          UpdateWikiPageSchema.parse(request.params.arguments);
-        return { content: [{ type: "text", text: JSON.stringify(wikiPage, null, 2) }] };
+        const wikiPage = await updateWikiPage(
+          project_id,
+          slug,
+          title,
+          content,
+          format
+        );
+        return {
+          content: [{ type: "text", text: JSON.stringify(wikiPage, null, 2) }],
+        };
       }
 
       case "delete_wiki_page": {
-        const { project_id, slug } = DeleteWikiPageSchema.parse(request.params.arguments);
+        const { project_id, slug } = DeleteWikiPageSchema.parse(
+          request.params.arguments
+        );
         await deleteWikiPage(project_id, slug);
-        return { content: [{ type: "text", text: JSON.stringify({ status: "success", message: "Wiki page deleted successfully" }, null, 2) }] };
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify(
+                {
+                  status: "success",
+                  message: "Wiki page deleted successfully",
+                },
+                null,
+                2
+              ),
+            },
+          ],
+        };
       }
 
       default:

package-lock.json

@@ -1,16 +1,17 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zereight/mcp-gitlab",
-      "version": "1.0.30",
+      "version": "1.0.32",
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/sdk": "1.8.0",
         "@types/node-fetch": "^2.6.12",
+        "form-data": "^4.0.0",
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
         "node-fetch": "^3.3.2",

schemas.ts

@@ -63,15 +63,17 @@ export const GitLabRepositorySchema = z.object({
   created_at: z.string().optional(),
   last_activity_at: z.string().optional(),
   default_branch: z.string().optional(),
-  namespace: z.object({
+  namespace: z
-    id: z.number(),
+    .object({
-    name: z.string(),
+      id: z.number(),
-    path: z.string(),
+      name: z.string(),
-    kind: z.string(),
+      path: z.string(),
-    full_path: z.string(),
+      kind: z.string(),
-    avatar_url: z.string().nullable().optional(),
+      full_path: z.string(),
-    web_url: z.string().optional(),
+      avatar_url: z.string().nullable().optional(),
-  }).optional(),
+      web_url: z.string().optional(),
+    })
+    .optional(),
   readme_url: z.string().optional().nullable(),
   topics: z.array(z.string()).optional(),
   tag_list: z.array(z.string()).optional(), // deprecated but still present
@@ -79,16 +81,24 @@ export const GitLabRepositorySchema = z.object({
   archived: z.boolean().optional(),
   forks_count: z.number().optional(),
   star_count: z.number().optional(),
-  permissions: z.object({
+  permissions: z
-    project_access: z.object({
+    .object({
-      access_level: z.number(),
+      project_access: z
-      notification_level: z.number().optional(),
+        .object({
-    }).optional().nullable(),
+          access_level: z.number(),
-    group_access: z.object({
+          notification_level: z.number().optional(),
-      access_level: z.number(),
+        })
-      notification_level: z.number().optional(),
+        .optional()
-    }).optional().nullable(),
+        .nullable(),
-  }).optional(),
+      group_access: z
+        .object({
+          access_level: z.number(),
+          notification_level: z.number().optional(),
+        })
+        .optional()
+        .nullable(),
+    })
+    .optional(),
   container_registry_enabled: z.boolean().optional(),
   container_registry_access_level: z.string().optional(),
   issues_enabled: z.boolean().optional(),
@@ -99,12 +109,16 @@ export const GitLabRepositorySchema = z.object({
   can_create_merge_request_in: z.boolean().optional(),
   resolve_outdated_diff_discussions: z.boolean().optional(),
   shared_runners_enabled: z.boolean().optional(),
-  shared_with_groups: z.array(z.object({
+  shared_with_groups: z
-    group_id: z.number(),
+    .array(
-    group_name: z.string(),
+      z.object({
-    group_full_path: z.string(),
+        group_id: z.number(),
-    group_access_level: z.number(),
+        group_name: z.string(),
-  })).optional(),
+        group_full_path: z.string(),
+        group_access_level: z.number(),
+      })
+    )
+    .optional(),
 });
 
 // Project schema (extended from repository schema)
@@ -276,17 +290,21 @@ export const GitLabIssueSchema = z.object({
   updated_at: z.string(),
   closed_at: z.string().nullable(),
   web_url: z.string(), // Changed from html_url to match GitLab API
-  references: z.object({
+  references: z
-    short: z.string(),
+    .object({
-    relative: z.string(),
+      short: z.string(),
-    full: z.string(),
+      relative: z.string(),
-  }).optional(),
+      full: z.string(),
-  time_stats: z.object({
+    })
-    time_estimate: z.number(),
+    .optional(),
-    total_time_spent: z.number(),
+  time_stats: z
-    human_time_estimate: z.string().nullable(),
+    .object({
-    human_total_time_spent: z.string().nullable(),
+      time_estimate: z.number(),
-  }).optional(),
+      total_time_spent: z.number(),
+      human_time_estimate: z.string().nullable(),
+      human_total_time_spent: z.string().nullable(),
+    })
+    .optional(),
   confidential: z.boolean().optional(),
   due_date: z.string().nullable().optional(),
   discussion_locked: z.boolean().nullable().optional(),
@@ -296,7 +314,7 @@ export const GitLabIssueSchema = z.object({
 // NEW SCHEMA: For issue with link details (used in listing issue links)
 export const GitLabIssueWithLinkDetailsSchema = GitLabIssueSchema.extend({
   issue_link_id: z.number(),
-  link_type: z.enum(['relates_to', 'blocks', 'is_blocked_by']),
+  link_type: z.enum(["relates_to", "blocks", "is_blocked_by"]),
   link_created_at: z.string(),
   link_updated_at: z.string(),
 });
@@ -305,11 +323,13 @@ export const GitLabIssueWithLinkDetailsSchema = GitLabIssueSchema.extend({
 export const GitLabForkParentSchema = z.object({
   name: z.string(),
   path_with_namespace: z.string(), // Changed from full_name to match GitLab API
-  owner: z.object({
+  owner: z
-    username: z.string(), // Changed from login to match GitLab API
+    .object({
-    id: z.number(),
+      username: z.string(), // Changed from login to match GitLab API
-    avatar_url: z.string(),
+      id: z.number(),
-  }).optional(), // Made optional to handle cases where GitLab API doesn't include it
+      avatar_url: z.string(),
+    })
+    .optional(), // Made optional to handle cases where GitLab API doesn't include it
   web_url: z.string(), // Changed from html_url to match GitLab API
 });
 
@@ -377,34 +397,40 @@ export const GitLabDiscussionNoteSchema = z.object({
   resolved: z.boolean().optional(),
   resolved_by: GitLabUserSchema.nullable().optional(),
   resolved_at: z.string().nullable().optional(),
-  position: z.object({ // Only present for DiffNote
+  position: z
-    base_sha: z.string(),
+    .object({
-    start_sha: z.string(),
+      // Only present for DiffNote
-    head_sha: z.string(),
+      base_sha: z.string(),
-    old_path: z.string(),
+      start_sha: z.string(),
-    new_path: z.string(),
+      head_sha: z.string(),
-    position_type: z.enum(["text", "image", "file"]),
+      old_path: z.string(),
-    old_line: z.number().nullable(),
+      new_path: z.string(),
-    new_line: z.number().nullable(),
+      position_type: z.enum(["text", "image", "file"]),
-    line_range: z.object({
+      old_line: z.number().nullable(),
-      start: z.object({
+      new_line: z.number().nullable(),
-        line_code: z.string(),
+      line_range: z
-        type: z.enum(["new", "old"]),
+        .object({
-        old_line: z.number().nullable(),
+          start: z.object({
-        new_line: z.number().nullable(),
+            line_code: z.string(),
-      }),
+            type: z.enum(["new", "old"]),
-      end: z.object({
+            old_line: z.number().nullable(),
-        line_code: z.string(),
+            new_line: z.number().nullable(),
-        type: z.enum(["new", "old"]),
+          }),
-        old_line: z.number().nullable(),
+          end: z.object({
-        new_line: z.number().nullable(),
+            line_code: z.string(),
-      }),
+            type: z.enum(["new", "old"]),
-    }).nullable().optional(), // For multi-line diff notes
+            old_line: z.number().nullable(),
-    width: z.number().optional(), // For image diff notes
+            new_line: z.number().nullable(),
-    height: z.number().optional(), // For image diff notes
+          }),
-    x: z.number().optional(), // For image diff notes
+        })
-    y: z.number().optional(), // For image diff notes
+        .nullable()
-  }).optional(),
+        .optional(), // For multi-line diff notes
+      width: z.number().optional(), // For image diff notes
+      height: z.number().optional(), // For image diff notes
+      x: z.number().optional(), // For image diff notes
+      y: z.number().optional(), // For image diff notes
+    })
+    .optional(),
 });
 export type GitLabDiscussionNote = z.infer<typeof GitLabDiscussionNoteSchema>;
 
@@ -440,10 +466,7 @@ export const CreateOrUpdateFileSchema = ProjectParamsSchema.extend({
     .string()
     .optional()
     .describe("Path of the file to move/rename"),
-  last_commit_id: z
+  last_commit_id: z.string().optional().describe("Last known file commit ID"),
-    .string()
-    .optional()
-    .describe("Last known file commit ID"),
   commit_id: z
     .string()
     .optional()
@@ -539,7 +562,9 @@ export const GitLabMergeRequestDiffSchema = z.object({
 export const GetMergeRequestSchema = ProjectParamsSchema.extend({
   merge_request_iid: z
     .number()
-    .describe("The internal ID of the merge request"),
+    .optional()
+    .describe("The IID of a merge request"),
+  source_branch: z.string().optional().describe("Source branch name"),
 });
 
 export const UpdateMergeRequestSchema = GetMergeRequestSchema.extend({
@@ -585,22 +610,61 @@ export const CreateNoteSchema = z.object({
 // Issues API operation schemas
 export const ListIssuesSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
-  assignee_id: z.number().optional().describe("Return issues assigned to the given user ID"),
+  assignee_id: z
-  assignee_username: z.string().optional().describe("Return issues assigned to the given username"),
+    .number()
-  author_id: z.number().optional().describe("Return issues created by the given user ID"),
+    .optional()
-  author_username: z.string().optional().describe("Return issues created by the given username"),
+    .describe("Return issues assigned to the given user ID"),
-  confidential: z.boolean().optional().describe("Filter confidential or public issues"),
+  assignee_username: z
-  created_after: z.string().optional().describe("Return issues created after the given time"),
+    .string()
-  created_before: z.string().optional().describe("Return issues created before the given time"),
+    .optional()
-  due_date: z.string().optional().describe("Return issues that have the due date"),
+    .describe("Return issues assigned to the given username"),
+  author_id: z
+    .number()
+    .optional()
+    .describe("Return issues created by the given user ID"),
+  author_username: z
+    .string()
+    .optional()
+    .describe("Return issues created by the given username"),
+  confidential: z
+    .boolean()
+    .optional()
+    .describe("Filter confidential or public issues"),
+  created_after: z
+    .string()
+    .optional()
+    .describe("Return issues created after the given time"),
+  created_before: z
+    .string()
+    .optional()
+    .describe("Return issues created before the given time"),
+  due_date: z
+    .string()
+    .optional()
+    .describe("Return issues that have the due date"),
   label_name: z.array(z.string()).optional().describe("Array of label names"),
   milestone: z.string().optional().describe("Milestone title"),
-  scope: z.enum(['created-by-me', 'assigned-to-me', 'all']).optional().describe("Return issues from a specific scope"),
+  scope: z
+    .enum(["created-by-me", "assigned-to-me", "all"])
+    .optional()
+    .describe("Return issues from a specific scope"),
   search: z.string().optional().describe("Search for specific terms"),
-  state: z.enum(['opened', 'closed', 'all']).optional().describe("Return issues with a specific state"),
+  state: z
-  updated_after: z.string().optional().describe("Return issues updated after the given time"),
+    .enum(["opened", "closed", "all"])
-  updated_before: z.string().optional().describe("Return issues updated before the given time"),
+    .optional()
-  with_labels_details: z.boolean().optional().describe("Return more details for each label"),
+    .describe("Return issues with a specific state"),
+  updated_after: z
+    .string()
+    .optional()
+    .describe("Return issues updated after the given time"),
+  updated_before: z
+    .string()
+    .optional()
+    .describe("Return issues updated before the given time"),
+  with_labels_details: z
+    .boolean()
+    .optional()
+    .describe("Return more details for each label"),
   page: z.number().optional().describe("Page number for pagination"),
   per_page: z.number().optional().describe("Number of items per page"),
 });
@@ -615,13 +679,28 @@ export const UpdateIssueSchema = z.object({
   issue_iid: z.number().describe("The internal ID of the project issue"),
   title: z.string().optional().describe("The title of the issue"),
   description: z.string().optional().describe("The description of the issue"),
-  assignee_ids: z.array(z.number()).optional().describe("Array of user IDs to assign issue to"),
+  assignee_ids: z
-  confidential: z.boolean().optional().describe("Set the issue to be confidential"),
+    .array(z.number())
-  discussion_locked: z.boolean().optional().describe("Flag to lock discussions"),
+    .optional()
-  due_date: z.string().optional().describe("Date the issue is due (YYYY-MM-DD)"),
+    .describe("Array of user IDs to assign issue to"),
+  confidential: z
+    .boolean()
+    .optional()
+    .describe("Set the issue to be confidential"),
+  discussion_locked: z
+    .boolean()
+    .optional()
+    .describe("Flag to lock discussions"),
+  due_date: z
+    .string()
+    .optional()
+    .describe("Date the issue is due (YYYY-MM-DD)"),
   labels: z.array(z.string()).optional().describe("Array of label names"),
   milestone_id: z.number().optional().describe("Milestone ID to assign"),
-  state_event: z.enum(['close', 'reopen']).optional().describe("Update issue state (close/reopen)"),
+  state_event: z
+    .enum(["close", "reopen"])
+    .optional()
+    .describe("Update issue state (close/reopen)"),
   weight: z.number().optional().describe("Weight of the issue (0-9)"),
 });
 
@@ -634,7 +713,7 @@ export const DeleteIssueSchema = z.object({
 export const GitLabIssueLinkSchema = z.object({
   source_issue: GitLabIssueSchema,
   target_issue: GitLabIssueSchema,
-  link_type: z.enum(['relates_to', 'blocks', 'is_blocked_by']),
+  link_type: z.enum(["relates_to", "blocks", "is_blocked_by"]),
 });
 
 export const ListIssueLinksSchema = z.object({
@@ -651,9 +730,16 @@ export const GetIssueLinkSchema = z.object({
 export const CreateIssueLinkSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
   issue_iid: z.number().describe("The internal ID of a project's issue"),
-  target_project_id: z.string().describe("The ID or URL-encoded path of a target project"),
+  target_project_id: z
-  target_issue_iid: z.number().describe("The internal ID of a target project's issue"),
+    .string()
-  link_type: z.enum(['relates_to', 'blocks', 'is_blocked_by']).optional().describe("The type of the relation, defaults to relates_to"),
+    .describe("The ID or URL-encoded path of a target project"),
+  target_issue_iid: z
+    .number()
+    .describe("The internal ID of a target project's issue"),
+  link_type: z
+    .enum(["relates_to", "blocks", "is_blocked_by"])
+    .optional()
+    .describe("The type of the relation, defaults to relates_to"),
 });
 
 export const DeleteIssueLinkSchema = z.object({
@@ -667,7 +753,10 @@ export const ListNamespacesSchema = z.object({
   search: z.string().optional().describe("Search term for namespaces"),
   page: z.number().optional().describe("Page number for pagination"),
   per_page: z.number().optional().describe("Number of items per page"),
-  owned: z.boolean().optional().describe("Filter for namespaces owned by current user"),
+  owned: z
+    .boolean()
+    .optional()
+    .describe("Filter for namespaces owned by current user"),
 });
 
 export const GetNamespaceSchema = z.object({
@@ -687,73 +776,170 @@ export const ListProjectsSchema = z.object({
   search: z.string().optional().describe("Search term for projects"),
   page: z.number().optional().describe("Page number for pagination"),
   per_page: z.number().optional().describe("Number of items per page"),
-  owned: z.boolean().optional().describe("Filter for projects owned by current user"),
+  search_namespaces: z
-  membership: z.boolean().optional().describe("Filter for projects where current user is a member"),
+    .boolean()
+    .optional()
+    .describe("Needs to be true if search is full path"),
+  owned: z
+    .boolean()
+    .optional()
+    .describe("Filter for projects owned by current user"),
+  membership: z
+    .boolean()
+    .optional()
+    .describe("Filter for projects where current user is a member"),
   simple: z.boolean().optional().describe("Return only limited fields"),
   archived: z.boolean().optional().describe("Filter for archived projects"),
-  visibility: z.enum(["public", "internal", "private"]).optional().describe("Filter by project visibility"),
+  visibility: z
-  order_by: z.enum(["id", "name", "path", "created_at", "updated_at", "last_activity_at"]).optional().describe("Return projects ordered by field"),
+    .enum(["public", "internal", "private"])
-  sort: z.enum(["asc", "desc"]).optional().describe("Return projects sorted in ascending or descending order"),
+    .optional()
-  with_issues_enabled: z.boolean().optional().describe("Filter projects with issues feature enabled"),
+    .describe("Filter by project visibility"),
-  with_merge_requests_enabled: z.boolean().optional().describe("Filter projects with merge requests feature enabled"),
+  order_by: z
-  min_access_level: z.number().optional().describe("Filter by minimum access level"),
+    .enum([
+      "id",
+      "name",
+      "path",
+      "created_at",
+      "updated_at",
+      "last_activity_at",
+    ])
+    .optional()
+    .describe("Return projects ordered by field"),
+  sort: z
+    .enum(["asc", "desc"])
+    .optional()
+    .describe("Return projects sorted in ascending or descending order"),
+  with_issues_enabled: z
+    .boolean()
+    .optional()
+    .describe("Filter projects with issues feature enabled"),
+  with_merge_requests_enabled: z
+    .boolean()
+    .optional()
+    .describe("Filter projects with merge requests feature enabled"),
+  min_access_level: z
+    .number()
+    .optional()
+    .describe("Filter by minimum access level"),
 });
 
 // Label operation schemas
 export const ListLabelsSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
-  with_counts: z.boolean().optional().describe("Whether or not to include issue and merge request counts"),
+  with_counts: z
-  include_ancestor_groups: z.boolean().optional().describe("Include ancestor groups"),
+    .boolean()
+    .optional()
+    .describe("Whether or not to include issue and merge request counts"),
+  include_ancestor_groups: z
+    .boolean()
+    .optional()
+    .describe("Include ancestor groups"),
   search: z.string().optional().describe("Keyword to filter labels by"),
 });
 
 export const GetLabelSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
-  label_id: z.union([z.number(), z.string()]).describe("The ID or title of a project's label"),
+  label_id: z
-  include_ancestor_groups: z.boolean().optional().describe("Include ancestor groups"),
+    .union([z.number(), z.string()])
+    .describe("The ID or title of a project's label"),
+  include_ancestor_groups: z
+    .boolean()
+    .optional()
+    .describe("Include ancestor groups"),
 });
 
 export const CreateLabelSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
   name: z.string().describe("The name of the label"),
-  color: z.string().describe("The color of the label given in 6-digit hex notation with leading '#' sign"),
+  color: z
+    .string()
+    .describe(
+      "The color of the label given in 6-digit hex notation with leading '#' sign"
+    ),
   description: z.string().optional().describe("The description of the label"),
-  priority: z.number().nullable().optional().describe("The priority of the label"),
+  priority: z
+    .number()
+    .nullable()
+    .optional()
+    .describe("The priority of the label"),
 });
 
 export const UpdateLabelSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
-  label_id: z.union([z.number(), z.string()]).describe("The ID or title of a project's label"),
+  label_id: z
+    .union([z.number(), z.string()])
+    .describe("The ID or title of a project's label"),
   new_name: z.string().optional().describe("The new name of the label"),
-  color: z.string().optional().describe("The color of the label given in 6-digit hex notation with leading '#' sign"),
+  color: z
-  description: z.string().optional().describe("The new description of the label"),
+    .string()
-  priority: z.number().nullable().optional().describe("The new priority of the label"),
+    .optional()
+    .describe(
+      "The color of the label given in 6-digit hex notation with leading '#' sign"
+    ),
+  description: z
+    .string()
+    .optional()
+    .describe("The new description of the label"),
+  priority: z
+    .number()
+    .nullable()
+    .optional()
+    .describe("The new priority of the label"),
 });
 
 export const DeleteLabelSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
-  label_id: z.union([z.number(), z.string()]).describe("The ID or title of a project's label"),
+  label_id: z
+    .union([z.number(), z.string()])
+    .describe("The ID or title of a project's label"),
 });
 
 // Group projects schema
 export const ListGroupProjectsSchema = z.object({
   group_id: z.string().describe("Group ID or path"),
-  include_subgroups: z.boolean().optional().describe("Include projects from subgroups"),
+  include_subgroups: z
+    .boolean()
+    .optional()
+    .describe("Include projects from subgroups"),
   search: z.string().optional().describe("Search term to filter projects"),
-  order_by: z.enum(['name', 'path', 'created_at', 'updated_at', 'last_activity_at']).optional().describe("Field to sort by"),
+  order_by: z
-  sort: z.enum(['asc', 'desc']).optional().describe("Sort direction"),
+    .enum(["name", "path", "created_at", "updated_at", "last_activity_at"])
+    .optional()
+    .describe("Field to sort by"),
+  sort: z.enum(["asc", "desc"]).optional().describe("Sort direction"),
   page: z.number().optional().describe("Page number"),
   per_page: z.number().optional().describe("Number of results per page"),
   archived: z.boolean().optional().describe("Filter for archived projects"),
-  visibility: z.enum(["public", "internal", "private"]).optional().describe("Filter by project visibility"),
+  visibility: z
-  with_issues_enabled: z.boolean().optional().describe("Filter projects with issues feature enabled"),
+    .enum(["public", "internal", "private"])
-  with_merge_requests_enabled: z.boolean().optional().describe("Filter projects with merge requests feature enabled"),
+    .optional()
-  min_access_level: z.number().optional().describe("Filter by minimum access level"),
+    .describe("Filter by project visibility"),
-  with_programming_language: z.string().optional().describe("Filter by programming language"),
+  with_issues_enabled: z
+    .boolean()
+    .optional()
+    .describe("Filter projects with issues feature enabled"),
+  with_merge_requests_enabled: z
+    .boolean()
+    .optional()
+    .describe("Filter projects with merge requests feature enabled"),
+  min_access_level: z
+    .number()
+    .optional()
+    .describe("Filter by minimum access level"),
+  with_programming_language: z
+    .string()
+    .optional()
+    .describe("Filter by programming language"),
   starred: z.boolean().optional().describe("Filter by starred projects"),
   statistics: z.boolean().optional().describe("Include project statistics"),
-  with_custom_attributes: z.boolean().optional().describe("Include custom attributes"),
+  with_custom_attributes: z
-  with_security_reports: z.boolean().optional().describe("Include security reports")
+    .boolean()
+    .optional()
+    .describe("Include custom attributes"),
+  with_security_reports: z
+    .boolean()
+    .optional()
+    .describe("Include security reports"),
 });
 
 // Add wiki operation schemas
@@ -770,14 +956,20 @@ export const CreateWikiPageSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
   title: z.string().describe("Title of the wiki page"),
   content: z.string().describe("Content of the wiki page"),
-  format: z.string().optional().describe("Content format, e.g., markdown, rdoc"),
+  format: z
+    .string()
+    .optional()
+    .describe("Content format, e.g., markdown, rdoc"),
 });
 export const UpdateWikiPageSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
   slug: z.string().describe("URL-encoded slug of the wiki page"),
   title: z.string().optional().describe("New title of the wiki page"),
   content: z.string().optional().describe("New content of the wiki page"),
-  format: z.string().optional().describe("Content format, e.g., markdown, rdoc"),
+  format: z
+    .string()
+    .optional()
+    .describe("Content format, e.g., markdown, rdoc"),
 });
 export const DeleteWikiPageSchema = z.object({
   project_id: z.string().describe("Project ID or URL-encoded path"),
@@ -798,27 +990,41 @@ export const GitLabWikiPageSchema = z.object({
 export type GitLabAuthor = z.infer<typeof GitLabAuthorSchema>;
 export type GitLabFork = z.infer<typeof GitLabForkSchema>;
 export type GitLabIssue = z.infer<typeof GitLabIssueSchema>;
-export type GitLabIssueWithLinkDetails = z.infer<typeof GitLabIssueWithLinkDetailsSchema>;
+export type GitLabIssueWithLinkDetails = z.infer<
+  typeof GitLabIssueWithLinkDetailsSchema
+>;
 export type GitLabMergeRequest = z.infer<typeof GitLabMergeRequestSchema>;
 export type GitLabRepository = z.infer<typeof GitLabRepositorySchema>;
 export type GitLabFileContent = z.infer<typeof GitLabFileContentSchema>;
-export type GitLabDirectoryContent = z.infer<typeof GitLabDirectoryContentSchema>;
+export type GitLabDirectoryContent = z.infer<
+  typeof GitLabDirectoryContentSchema
+>;
 export type GitLabContent = z.infer<typeof GitLabContentSchema>;
 export type FileOperation = z.infer<typeof FileOperationSchema>;
 export type GitLabTree = z.infer<typeof GitLabTreeSchema>;
 export type GitLabCommit = z.infer<typeof GitLabCommitSchema>;
 export type GitLabReference = z.infer<typeof GitLabReferenceSchema>;
-export type CreateRepositoryOptions = z.infer<typeof CreateRepositoryOptionsSchema>;
+export type CreateRepositoryOptions = z.infer<
+  typeof CreateRepositoryOptionsSchema
+>;
 export type CreateIssueOptions = z.infer<typeof CreateIssueOptionsSchema>;
-export type CreateMergeRequestOptions = z.infer<typeof CreateMergeRequestOptionsSchema>;
+export type CreateMergeRequestOptions = z.infer<
+  typeof CreateMergeRequestOptionsSchema
+>;
 export type CreateBranchOptions = z.infer<typeof CreateBranchOptionsSchema>;
-export type GitLabCreateUpdateFileResponse = z.infer<typeof GitLabCreateUpdateFileResponseSchema>;
+export type GitLabCreateUpdateFileResponse = z.infer<
+  typeof GitLabCreateUpdateFileResponseSchema
+>;
 export type GitLabSearchResponse = z.infer<typeof GitLabSearchResponseSchema>;
-export type GitLabMergeRequestDiff = z.infer<typeof GitLabMergeRequestDiffSchema>;
+export type GitLabMergeRequestDiff = z.infer<
+  typeof GitLabMergeRequestDiffSchema
+>;
 export type CreateNoteOptions = z.infer<typeof CreateNoteSchema>;
 export type GitLabIssueLink = z.infer<typeof GitLabIssueLinkSchema>;
 export type GitLabNamespace = z.infer<typeof GitLabNamespaceSchema>;
-export type GitLabNamespaceExistsResponse = z.infer<typeof GitLabNamespaceExistsResponseSchema>;
+export type GitLabNamespaceExistsResponse = z.infer<
+  typeof GitLabNamespaceExistsResponseSchema
+>;
 export type GitLabProject = z.infer<typeof GitLabProjectSchema>;
 export type GitLabLabel = z.infer<typeof GitLabLabelSchema>;
 export type ListWikiPagesOptions = z.infer<typeof ListWikiPagesSchema>;