@zereight/mcp-gitlab 1.0.14 → 1.0.16

package/build/index.js

@@ -264,7 +264,7 @@ async function createMergeRequest(projectId, options) {
  * @param {string} [previousPath] - The previous path of the file in case of rename
  * @returns {Promise<GitLabCreateUpdateFileResponse>} The file update response
  */
-async function createOrUpdateFile(projectId, filePath, content, commitMessage, branch, previousPath) {
+async function createOrUpdateFile(projectId, filePath, content, commitMessage, branch, previousPath, last_commit_id, commit_id) {
     const encodedPath = encodeURIComponent(filePath);
     const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(projectId)}/repository/files/${encodedPath}`);
     const body = {
@@ -277,14 +277,38 @@ async function createOrUpdateFile(projectId, filePath, content, commitMessage, b
     // Check if file exists
     let method = "POST";
     try {
-        await getFileContents(projectId, filePath, branch);
+        // Get file contents to check existence and retrieve commit IDs
+        const fileData = await getFileContents(projectId, filePath, branch);
         method = "PUT";
+        // If fileData is not an array, it's a file content object with commit IDs
+        if (!Array.isArray(fileData)) {
+            // Use commit IDs from the file data if not provided in parameters
+            if (!commit_id && fileData.commit_id) {
+                body.commit_id = fileData.commit_id;
+            }
+            else if (commit_id) {
+                body.commit_id = commit_id;
+            }
+            if (!last_commit_id && fileData.last_commit_id) {
+                body.last_commit_id = fileData.last_commit_id;
+            }
+            else if (last_commit_id) {
+                body.last_commit_id = last_commit_id;
+            }
+        }
     }
     catch (error) {
         if (!(error instanceof Error && error.message.includes("File not found"))) {
             throw error;
         }
-        // File doesn't exist, use POST
+        // File doesn't exist, use POST - no need for commit IDs for new files
+        // But still use any provided as parameters if they exist
+        if (commit_id) {
+            body.commit_id = commit_id;
+        }
+        if (last_commit_id) {
+            body.last_commit_id = last_commit_id;
+        }
     }
     const response = await fetch(url.toString(), {
         method,
@@ -614,11 +638,23 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         }
         switch (request.params.name) {
             case "fork_repository": {
-                const args = ForkRepositorySchema.parse(request.params.arguments);
-                const fork = await forkProject(args.project_id, args.namespace);
-                return {
-                    content: [{ type: "text", text: JSON.stringify(fork, null, 2) }],
-                };
+                const forkArgs = ForkRepositorySchema.parse(request.params.arguments);
+                try {
+                    const forkedProject = await forkProject(forkArgs.project_id, forkArgs.namespace);
+                    return {
+                        content: [{ type: "text", text: JSON.stringify(forkedProject, null, 2) }],
+                    };
+                }
+                catch (forkError) {
+                    console.error("Error forking repository:", forkError);
+                    let forkErrorMessage = "Failed to fork repository";
+                    if (forkError instanceof Error) {
+                        forkErrorMessage = `${forkErrorMessage}: ${forkError.message}`;
+                    }
+                    return {
+                        content: [{ type: "text", text: JSON.stringify({ error: forkErrorMessage }, null, 2) }],
+                    };
+                }
             }
             case "create_branch": {
                 const args = CreateBranchSchema.parse(request.params.arguments);
@@ -659,7 +695,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             case "create_or_update_file": {
                 const args = CreateOrUpdateFileSchema.parse(request.params.arguments);
-                const result = await createOrUpdateFile(args.project_id, args.file_path, args.content, args.commit_message, args.branch, args.previous_path);
+                const result = await createOrUpdateFile(args.project_id, args.file_path, args.content, args.commit_message, args.branch, args.previous_path, args.last_commit_id, args.commit_id);
                 return {
                     content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
                 };

package/build/schemas.js

@@ -39,7 +39,9 @@ export const GitLabFileContentSchema = z.object({
     content_sha256: z.string(), // Changed from sha to match GitLab API
     ref: z.string(), // Added as GitLab requires branch reference
     blob_id: z.string(), // Added to match GitLab API
+    commit_id: z.string(), // ID of the current file version
     last_commit_id: z.string(), // Added to match GitLab API
+    execute_filemode: z.boolean().optional(), // Added to match GitLab API
 });
 export const GitLabDirectoryContentSchema = z.object({
     name: z.string(),
@@ -122,7 +124,7 @@ export const CreateBranchOptionsSchema = z.object({
 export const GitLabCreateUpdateFileResponseSchema = z.object({
     file_path: z.string(),
     branch: z.string(),
-    commit_id: z.string(), // Changed from sha to match GitLab API
+    commit_id: z.string().optional(), // Optional since it's not always returned by the API
     content: GitLabFileContentSchema.optional(),
 });
 export const GitLabSearchResponseSchema = z.object({
@@ -139,11 +141,11 @@ export const GitLabForkParentSchema = z.object({
         username: z.string(), // Changed from login to match GitLab API
         id: z.number(),
         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
 });
 export const GitLabForkSchema = GitLabRepositorySchema.extend({
-    forked_from_project: GitLabForkParentSchema, // Changed from parent to match GitLab API
+    forked_from_project: GitLabForkParentSchema.optional(), // Made optional to handle cases where GitLab API doesn't include it
 });
 // Issue related schemas
 export const GitLabLabelSchema = z.object({
@@ -236,6 +238,14 @@ export const CreateOrUpdateFileSchema = ProjectParamsSchema.extend({
         .string()
         .optional()
         .describe("Path of the file to move/rename"),
+    last_commit_id: z
+        .string()
+        .optional()
+        .describe("Last known file commit ID"),
+    commit_id: z
+        .string()
+        .optional()
+        .describe("Current file commit ID (for update operations)"),
 });
 export const SearchRepositoriesSchema = z.object({
     search: z.string().describe("Search query"), // Changed from query to match GitLab API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "MCP server for using the GitLab API",
   "license": "MIT",
   "author": "zereight",