feat: support resolving merge request notes

Nicholas Crum · Nicholas Crum · commit 4c349a32340f · 2025-05-13T14:54:05.000-06:00
diff --git a/index.ts b/index.ts
@@ -1027,7 +1027,7 @@ async function updateMergeRequestNote(
   mergeRequestIid: number,
   discussionId: string,
   noteId: number,
-  body: string,
+  body?: string,
   resolved?: boolean
 ): Promise<GitLabDiscussionNote> {
   projectId = decodeURIComponent(projectId); // Decode project ID
@@ -1037,8 +1037,11 @@ async function updateMergeRequestNote(
     )}/merge_requests/${mergeRequestIid}/discussions/${discussionId}/notes/${noteId}`
   );
 
-  const payload: { body: string; resolved?: boolean } = { body };
-  if (resolved !== undefined) {
+  // Only one of body or resolved can be sent according to GitLab API
+  const payload: { body?: string; resolved?: boolean } = {};
+  if (body !== undefined) {
+    payload.body = body;
+  } else if (resolved !== undefined) {
     payload.resolved = resolved;
   }
 
@@ -2270,8 +2273,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           args.merge_request_iid,
           args.discussion_id,
           args.note_id,
-          args.body,
-          args.resolved // Pass resolved if provided
+          args.body, // Now optional
+          args.resolved // Now one of body or resolved must be provided, not both
         );
         return {
           content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
diff --git a/package-lock.json b/package-lock.json
diff --git a/schemas.ts b/schemas.ts
@@ -475,8 +475,12 @@ export const UpdateMergeRequestNoteSchema = ProjectParamsSchema.extend({
   merge_request_iid: z.number().describe("The IID of a merge request"),
   discussion_id: z.string().describe("The ID of a thread"),
   note_id: z.number().describe("The ID of a thread note"),
-  body: z.string().describe("The content of the note or reply"),
-  resolved: z.boolean().optional().describe("Resolve or unresolve the note"), // Optional based on API docs
+  body: z.string().optional().describe("The content of the note or reply"),
+  resolved: z.boolean().optional().describe("Resolve or unresolve the note"),
+}).refine(data => data.body !== undefined || data.resolved !== undefined, {
+  message: "At least one of 'body' or 'resolved' must be provided"
+}).refine(data => !(data.body !== undefined && data.resolved !== undefined), {
+  message: "Only one of 'body' or 'resolved' can be provided, not both"
 });
 
 // API Operation Parameter Schemas
