gitmanager/gitlab-mcp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from chad-loder/fix-file-operations-parameters

Browse Source 
Fix GitLab API parameter handling in create_or_update_file
This commit is contained in:
zereight
2025-03-18 15:51:31 +09:00
committed by GitHub
parent 933a5f6ab6 6cb8e559e0
commit c3e7f5afa6
2 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
index.ts
View File

@ -401,7 +401,9 @@ async function createOrUpdateFile(
content: string,
commitMessage: string,
branch: string,
previousPath?: string
previousPath?: string,
last_commit_id?: string,
commit_id?: string
): Promise<GitLabCreateUpdateFileResponse> {
const encodedPath = encodeURIComponent(filePath);
const url = new URL(
@ -410,7 +412,7 @@ async function createOrUpdateFile(
)}/repository/files/${encodedPath}`
);
const body = {
const body: Record<string, any> = {
branch,
content,
commit_message: commitMessage,
@ -421,13 +423,37 @@ async function createOrUpdateFile(
// 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(), {
@ -934,7 +960,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
args.content,
args.commit_message,
args.branch,
args.previous_path
args.previous_path,
args.last_commit_id,
args.commit_id
);
return {
content: [{ type: "text", text: JSON.stringify(result, null, 2) }],

12
schemas.ts
View File

@ -43,7 +43,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({
@ -138,7 +140,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(),
});
@ -263,6 +265,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({