chore(release): 1.0.42 - issue note 기능 추가 (#47)

feat: add support for creating and updating issue notes

CHANGELOG.md

@@ -1,5 +1,20 @@
-## [Released] - 2025-05-13
+## [1.0.42] - 2025-05-22
+
+### Added
+
+- 이슈(issues)에 노트(note)를 생성하고 수정할 수 있는 기능이 추가되었습니다.
+- 이제 버그나 할 일 같은 이슈에도 댓글(메모)을 달거나, 이미 단 댓글을 고칠 수 있습니다.
+- 예시: "버그를 고쳤어요!"라는 댓글을 이슈에 달 수 있고, 필요하면 "버그를 완전히 고쳤어요!"로 바꿀 수 있습니다.
+- 함수형 프로그래밍 원칙과 SOLID 원칙을 준수하여, 코드의 재사용성과 유지보수성이 높아졌습니다.
+- 출처: [PR #47](https://github.com/zereight/gitlab-mcp/pull/47)
+
+---
+
+## [1.0.38] - 2025-05-17
 
 ### Fixed
 
-- **GitLab MCP Server:** Modified GitLab API helper functions to decode the `project_id` using `decodeURIComponent()` before processing. This resolves API call failures caused by differences in project ID encoding between Gemini and other AI models. API requests are now handled consistently regardless of the model.
+- Added `expanded` property to `start` and `end` in `GitLabDiscussionNoteSchema`  
+  Now you can expand or collapse more information at the start and end of discussion notes.  
+  Example: In code review, you can choose to show or hide specific parts of the discussion.  
+  (See: [PR #40](https://github.com/zereight/gitlab-mcp/pull/40))

Dockerfile

@@ -0,0 +1,24 @@
+FROM node:22.15-alpine AS builder
+
+COPY . /app
+COPY tsconfig.json /tsconfig.json
+
+WORKDIR /app
+
+RUN --mount=type=cache,target=/root/.npm npm install
+
+RUN --mount=type=cache,target=/root/.npm-production npm ci --ignore-scripts --omit-dev
+
+FROM node:22.12-alpine AS release
+
+WORKDIR /app
+
+COPY --from=builder /app/build /app/build
+COPY --from=builder /app/package.json /app/package.json
+COPY --from=builder /app/package-lock.json /app/package-lock.json
+
+ENV NODE_ENV=production
+
+RUN npm ci --ignore-scripts --omit-dev
+
+ENTRYPOINT ["node", "build/index.js"]

README.md

@@ -14,6 +14,8 @@ GitLab MCP(Model Context Protocol) Server. **Includes bug fixes and improvements
 
 When using with the Claude App, you need to set up your API key and URLs directly.
 
+#### npx
+
 ```json
 {
   "mcpServers": {
@@ -31,8 +33,39 @@ When using with the Claude App, you need to set up your API key and URLs directl
 }
 ```
 
-### Environment Variables
+#### Docker
 
+```json
+{
+  "mcpServers": {
+    "GitLab communication server": {
+      "command": "docker",
+      "args": [
+        "run",
+        "-i",
+        "--rm",
+        "-e",
+        "GITLAB_PERSONAL_ACCESS_TOKEN",
+        "-e",
+        "GITLAB_API_URL",
+        "-e",
+        "GITLAB_READ_ONLY_MODE",
+        "-e",
+        "USE_GITLAB_WIKI",
+        "nkwd/gitlab-mcp"
+      ],
+      "env": {
+        "GITLAB_PERSONAL_ACCESS_TOKEN": "your_gitlab_token",
+        "GITLAB_API_URL": "https://gitlab.com/api/v4", // Optional, for self-hosted GitLab
+        "GITLAB_READ_ONLY_MODE": "false",
+        "USE_GITLAB_WIKI": "true"
+      }
+    }
+  }
+}
+```
+
+### Environment Variables
 
 - `GITLAB_PERSONAL_ACCESS_TOKEN`: Your GitLab personal access token.
 - `GITLAB_API_URL`: Your GitLab API URL. (Default: `https://gitlab.com/api/v4`)
@@ -42,6 +75,7 @@ When using with the Claude App, you need to set up your API key and URLs directl
 ## Tools 🛠️
 
 +<!-- TOOLS-START -->
+
 1. `create_or_update_file` - Create or update a single file in a GitLab project
 2. `search_repositories` - Search for GitLab projects
 3. `create_repository` - Create a new GitLab project
@@ -55,31 +89,36 @@ When using with the Claude App, you need to set up your API key and URLs directl
 11. `get_merge_request_diffs` - Get the changes/diffs of a merge request (Either mergeRequestIid or branchName must be provided)
 12. `update_merge_request` - Update a merge request (Either mergeRequestIid or branchName must be provided)
 13. `create_note` - Create a new note (comment) to an issue or merge request
-14. `mr_discussions` - List discussion items for a merge request
-15. `update_merge_request_note` - Modify an existing merge request thread note
-16. `list_issues` - List issues in a GitLab project with filtering options
-17. `get_issue` - Get details of a specific issue in a GitLab project
-18. `update_issue` - Update an issue in a GitLab project
-19. `delete_issue` - Delete an issue from a GitLab project
-20. `list_issue_links` - List all issue links for a specific issue
-21. `get_issue_link` - Get a specific issue link
-22. `create_issue_link` - Create an issue link between two issues
-23. `delete_issue_link` - Delete an issue link
-24. `list_namespaces` - List all namespaces available to the current user
-25. `get_namespace` - Get details of a namespace by ID or path
-26. `verify_namespace` - Verify if a namespace path exists
-27. `get_project` - Get details of a specific project
-28. `list_projects` - List projects accessible by the current user
-29. `list_labels` - List labels for a project
-30. `get_label` - Get a single label from a project
-31. `create_label` - Create a new label in a project
-32. `update_label` - Update an existing label in a project
-33. `delete_label` - Delete a label from a project
-34. `list_group_projects` - List projects in a GitLab group with filtering options
-35. `list_wiki_pages` - List wiki pages in a GitLab project
-36. `get_wiki_page` - Get details of a specific wiki page
-37. `create_wiki_page` - Create a new wiki page in a GitLab project
-38. `update_wiki_page` - Update an existing wiki page in a GitLab project
-39. `delete_wiki_page` - Delete a wiki page from a GitLab project
-40. `get_repository_tree` - Get the repository tree for a GitLab project (list files and directories)
+14. `create_merge_request_thread` - Create a new thread on a merge request
+15. `mr_discussions` - List discussion items for a merge request
+16. `update_merge_request_note` - Modify an existing merge request thread note
+17. `create_merge_request_note` - Add a new note to an existing merge request thread
+18. `update_issue_note` - Update the content of an existing issue note
+19. `create_issue_note` - Add a new note to an existing issue thread
+20. `list_issues` - List issues in a GitLab project with filtering options
+21. `get_issue` - Get details of a specific issue in a GitLab project
+22. `update_issue` - Update an issue in a GitLab project
+23. `delete_issue` - Delete an issue from a GitLab project
+24. `list_issue_links` - List all issue links for a specific issue
+25. `list_issue_discussions` - List discussions for an issue in a GitLab project
+26. `get_issue_link` - Get a specific issue link
+27. `create_issue_link` - Create an issue link between two issues
+28. `delete_issue_link` - Delete an issue link
+29. `list_namespaces` - List all namespaces available to the current user
+30. `get_namespace` - Get details of a namespace by ID or path
+31. `verify_namespace` - Verify if a namespace path exists
+32. `get_project` - Get details of a specific project
+33. `list_projects` - List projects accessible by the current user
+34. `list_labels` - List labels for a project
+35. `get_label` - Get a single label from a project
+36. `create_label` - Create a new label in a project
+37. `update_label` - Update an existing label in a project
+38. `delete_label` - Delete a label from a project
+39. `list_group_projects` - List projects in a GitLab group with filtering options
+40. `list_wiki_pages` - List wiki pages in a GitLab project
+41. `get_wiki_page` - Get details of a specific wiki page
+42. `create_wiki_page` - Create a new wiki page in a GitLab project
+43. `update_wiki_page` - Update an existing wiki page in a GitLab project
+44. `delete_wiki_page` - Delete a wiki page from a GitLab project
+45. `get_repository_tree` - Get the repository tree for a GitLab project (list files and directories)
 <!-- TOOLS-END -->

index.ts

@@ -61,6 +61,7 @@ import {
   GitLabIssueLinkSchema,
   GitLabIssueWithLinkDetailsSchema,
   ListIssueLinksSchema,
+  ListIssueDiscussionsSchema,
   GetIssueLinkSchema,
   CreateIssueLinkSchema,
   DeleteIssueLinkSchema,
@@ -75,6 +76,7 @@ import {
   UpdateLabelSchema,
   DeleteLabelSchema,
   CreateNoteSchema,
+  CreateMergeRequestThreadSchema,
   ListGroupProjectsSchema,
   ListWikiPagesSchema,
   GetWikiPageSchema,
@@ -86,6 +88,7 @@ import {
   GitLabDiscussionNoteSchema, // Added
   GitLabDiscussionSchema,
   UpdateMergeRequestNoteSchema, // Added
+  CreateMergeRequestNoteSchema, // Added
   ListMergeRequestDiscussionsSchema,
   type GitLabFork,
   type GitLabReference,
@@ -108,6 +111,7 @@ import {
   // Discussion Types
   type GitLabDiscussionNote, // Added
   type GitLabDiscussion,
+  type MergeRequestThreadPosition,
   type GetWikiPageOptions,
   type CreateWikiPageOptions,
   type UpdateWikiPageOptions,
@@ -117,6 +121,8 @@ import {
   GetRepositoryTreeSchema,
   type GitLabTreeItem,
   type GetRepositoryTreeOptions,
+  UpdateIssueNoteSchema,
+  CreateIssueNoteSchema,
 } from "./schemas.js";
 
 /**
@@ -263,6 +269,11 @@ const allTools = [
     description: "Create a new note (comment) to an issue or merge request",
     inputSchema: zodToJsonSchema(CreateNoteSchema),
   },
+  {
+    name: "create_merge_request_thread",
+    description: "Create a new thread on a merge request",
+    inputSchema: zodToJsonSchema(CreateMergeRequestThreadSchema),
+  },
   {
     name: "mr_discussions",
     description: "List discussion items for a merge request",
@@ -273,6 +284,21 @@ const allTools = [
     description: "Modify an existing merge request thread note",
     inputSchema: zodToJsonSchema(UpdateMergeRequestNoteSchema),
   },
+  {
+    name: "create_merge_request_note",
+    description: "Add a new note to an existing merge request thread",
+    inputSchema: zodToJsonSchema(CreateMergeRequestNoteSchema),
+  },
+  {
+    name: "update_issue_note",
+    description: "Modify an existing issue thread note",
+    inputSchema: zodToJsonSchema(UpdateIssueNoteSchema),
+  },
+  {
+    name: "create_issue_note",
+    description: "Add a new note to an existing issue thread",
+    inputSchema: zodToJsonSchema(CreateIssueNoteSchema),
+  },
   {
     name: "list_issues",
     description: "List issues in a GitLab project with filtering options",
@@ -298,6 +324,11 @@ const allTools = [
     description: "List all issue links for a specific issue",
     inputSchema: zodToJsonSchema(ListIssueLinksSchema),
   },
+  {
+    name: "list_issue_discussions",
+    description: "List discussions for an issue in a GitLab project",
+    inputSchema: zodToJsonSchema(ListIssueDiscussionsSchema),
+  },
   {
     name: "get_issue_link",
     description: "Get a specific issue link",
@@ -411,6 +442,7 @@ const readOnlyTools = [
   "list_issues",
   "get_issue",
   "list_issue_links",
+  "list_issue_discussions",
   "get_issue_link",
   "list_namespaces",
   "get_namespace",
@@ -1010,6 +1042,56 @@ async function listMergeRequestDiscussions(
   return z.array(GitLabDiscussionSchema).parse(data);
 }
 
+/**
+ * List discussions for an issue
+ *
+ * @param {string} projectId - The ID or URL-encoded path of the project
+ * @param {number} issueIid - The internal ID of the project issue
+ * @param {Object} options - Pagination and sorting options
+ * @returns {Promise<GitLabDiscussion[]>} List of issue discussions
+ */
+async function listIssueDiscussions(
+  projectId: string,
+  issueIid: number,
+  options: {
+    page?: number,
+    per_page?: number,
+    sort?: "asc" | "desc",
+    order_by?: "created_at" | "updated_at"
+  } = {}
+): Promise<GitLabDiscussion[]> {
+  projectId = decodeURIComponent(projectId); // Decode project ID
+  const url = new URL(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
+      projectId
+    )}/issues/${issueIid}/discussions`
+  );
+
+  // Add query parameters for pagination and sorting
+  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.sort) {
+    url.searchParams.append("sort", options.sort);
+  }
+  if (options.order_by) {
+    url.searchParams.append("order_by", options.order_by);
+  }
+
+  const response = await fetch(url.toString(), {
+    ...DEFAULT_FETCH_CONFIG,
+  });
+
+  await handleGitLabError(response);
+  const data = await response.json();
+
+  // Parse the response as an array of discussions
+  return z.array(GitLabDiscussionSchema).parse(data);
+}
+
 /**
  * Modify an existing merge request thread note
  * 병합 요청 토론 노트 수정
@@ -1027,7 +1109,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 +1119,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;
   }
 
@@ -1053,6 +1138,122 @@ async function updateMergeRequestNote(
   return GitLabDiscussionNoteSchema.parse(data);
 }
 
+/**
+ * Update an issue discussion note
+ * @param {string} projectId - The ID or URL-encoded path of the project
+ * @param {number} issueIid - The IID of an issue
+ * @param {string} discussionId - The ID of a thread
+ * @param {number} noteId - The ID of a thread note
+ * @param {string} body - The new content of the note
+ * @returns {Promise<GitLabDiscussionNote>} The updated note
+ */
+async function updateIssueNote(
+  projectId: string,
+  issueIid: number,
+  discussionId: string,
+  noteId: number,
+  body: string
+): Promise<GitLabDiscussionNote> {
+  projectId = decodeURIComponent(projectId); // Decode project ID
+  const url = new URL(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
+      projectId
+    )}/issues/${issueIid}/discussions/${discussionId}/notes/${noteId}`
+  );
+
+  const payload = { body };
+
+  const response = await fetch(url.toString(), {
+    ...DEFAULT_FETCH_CONFIG,
+    method: "PUT",
+    body: JSON.stringify(payload),
+  });
+
+  await handleGitLabError(response);
+  const data = await response.json();
+  return GitLabDiscussionNoteSchema.parse(data);
+}
+
+/**
+ * Create a note in an issue discussion
+ * @param {string} projectId - The ID or URL-encoded path of the project
+ * @param {number} issueIid - The IID of an issue
+ * @param {string} discussionId - The ID of a thread
+ * @param {string} body - The content of the new note
+ * @param {string} [createdAt] - The creation date of the note (ISO 8601 format)
+ * @returns {Promise<GitLabDiscussionNote>} The created note
+ */
+async function createIssueNote(
+  projectId: string,
+  issueIid: number,
+  discussionId: string,
+  body: string,
+  createdAt?: string
+): Promise<GitLabDiscussionNote> {
+  projectId = decodeURIComponent(projectId); // Decode project ID
+  const url = new URL(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
+      projectId
+    )}/issues/${issueIid}/discussions/${discussionId}/notes`
+  );
+
+  const payload: { body: string; created_at?: string } = { body };
+  if (createdAt) {
+    payload.created_at = createdAt;
+  }
+
+  const response = await fetch(url.toString(), {
+    ...DEFAULT_FETCH_CONFIG,
+    method: "POST",
+    body: JSON.stringify(payload),
+  });
+
+  await handleGitLabError(response);
+  const data = await response.json();
+  return GitLabDiscussionNoteSchema.parse(data);
+}
+
+/**
+ * Add a new note to an existing merge request thread
+ * 기존 병합 요청 스레드에 새 노트 추가
+ *
+ * @param {string} projectId - The ID or URL-encoded path of the project
+ * @param {number} mergeRequestIid - The IID of a merge request
+ * @param {string} discussionId - The ID of a thread
+ * @param {string} body - The content of the new note
+ * @param {string} [createdAt] - The creation date of the note (ISO 8601 format)
+ * @returns {Promise<GitLabDiscussionNote>} The created note
+ */
+async function createMergeRequestNote(
+  projectId: string,
+  mergeRequestIid: number,
+  discussionId: string,
+  body: string,
+  createdAt?: string
+): Promise<GitLabDiscussionNote> {
+  projectId = decodeURIComponent(projectId); // Decode project ID
+  const url = new URL(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
+      projectId
+    )}/merge_requests/${mergeRequestIid}/discussions/${discussionId}/notes`
+  );
+
+  const payload: { body: string; created_at?: string } = { body };
+  if (createdAt) {
+    payload.created_at = createdAt;
+  }
+
+  const response = await fetch(url.toString(), {
+    ...DEFAULT_FETCH_CONFIG,
+    method: "POST",
+    body: JSON.stringify(payload),
+  });
+
+  await handleGitLabError(response);
+  const data = await response.json();
+  return GitLabDiscussionNoteSchema.parse(data);
+}
+
 /**
  * Create or update a file in a GitLab project
  * 파일 생성 또는 업데이트
@@ -1520,6 +1721,59 @@ async function createNote(
   return await response.json();
 }
 
+/**
+ * Create a new thread on a merge request
+ * 📦 새로운 함수: createMergeRequestThread - 병합 요청에 새로운 스레드(토론)를 생성하는 함수
+ * (New function: createMergeRequestThread - Function to create a new thread (discussion) on a merge request)
+ *
+ * This function provides more capabilities than createNote, including the ability to:
+ * - Create diff notes (comments on specific lines of code)
+ * - Specify exact positions for comments
+ * - Set creation timestamps
+ *
+ * @param {string} projectId - The ID or URL-encoded path of the project
+ * @param {number} mergeRequestIid - The internal ID of the merge request
+ * @param {string} body - The content of the thread
+ * @param {MergeRequestThreadPosition} [position] - Position information for diff notes
+ * @param {string} [createdAt] - ISO 8601 formatted creation date
+ * @returns {Promise<GitLabDiscussion>} The created discussion thread
+ */
+async function createMergeRequestThread(
+  projectId: string,
+  mergeRequestIid: number,
+  body: string,
+  position?: MergeRequestThreadPosition,
+  createdAt?: string
+): Promise<GitLabDiscussion> {
+  projectId = decodeURIComponent(projectId); // Decode project ID
+  const url = new URL(
+    `${GITLAB_API_URL}/projects/${encodeURIComponent(
+      projectId
+    )}/merge_requests/${mergeRequestIid}/discussions`
+  );
+
+  const payload: Record<string, any> = { body };
+
+  // Add optional parameters if provided
+  if (position) {
+    payload.position = position;
+  }
+
+  if (createdAt) {
+    payload.created_at = createdAt;
+  }
+
+  const response = await fetch(url.toString(), {
+    ...DEFAULT_FETCH_CONFIG,
+    method: "POST",
+    body: JSON.stringify(payload),
+  });
+
+  await handleGitLabError(response);
+  const data = await response.json();
+  return GitLabDiscussionSchema.parse(data);
+}
+
 /**
  * List all namespaces
  * 사용 가능한 모든 네임스페이스 목록 조회
@@ -2270,8 +2524,56 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           args.merge_request_iid,
           args.discussion_id,
           args.note_id,
+          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) }],
+        };
+      }
+
+      case "create_merge_request_note": {
+        const args = CreateMergeRequestNoteSchema.parse(
+          request.params.arguments
+        );
+        const note = await createMergeRequestNote(
+          args.project_id,
+          args.merge_request_iid,
+          args.discussion_id,
           args.body,
-          args.resolved // Pass resolved if provided
+          args.created_at
+        );
+        return {
+          content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
+        };
+      }
+
+      case "update_issue_note": {
+        const args = UpdateIssueNoteSchema.parse(
+          request.params.arguments
+        );
+        const note = await updateIssueNote(
+          args.project_id,
+          args.issue_iid,
+          args.discussion_id,
+          args.note_id,
+          args.body
+        );
+        return {
+          content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
+        };
+      }
+
+      case "create_issue_note": {
+        const args = CreateIssueNoteSchema.parse(
+          request.params.arguments
+        );
+        const note = await createIssueNote(
+          args.project_id,
+          args.issue_iid,
+          args.discussion_id,
+          args.body,
+          args.created_at
         );
         return {
           content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
@@ -2454,6 +2756,22 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         };
       }
 
+      case "create_merge_request_thread": {
+        const args = CreateMergeRequestThreadSchema.parse(request.params.arguments);
+        const { project_id, merge_request_iid, body, position, created_at } = args;
+
+        const thread = await createMergeRequestThread(
+          project_id,
+          merge_request_iid,
+          body,
+          position,
+          created_at
+        );
+        return {
+          content: [{ type: "text", text: JSON.stringify(thread, null, 2) }],
+        };
+      }
+
       case "list_issues": {
         const args = ListIssuesSchema.parse(request.params.arguments);
         const { project_id, ...options } = args;
@@ -2505,6 +2823,16 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         };
       }
 
+      case "list_issue_discussions": {
+        const args = ListIssueDiscussionsSchema.parse(request.params.arguments);
+        const { project_id, issue_iid, ...options } = args;
+
+        const discussions = await listIssueDiscussions(project_id, issue_iid, options);
+        return {
+          content: [{ type: "text", text: JSON.stringify(discussions, null, 2) }],
+        };
+      }
+
       case "get_issue_link": {
         const args = GetIssueLinkSchema.parse(request.params.arguments);
         const link = await getIssueLink(

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "1.0.33",
+  "version": "1.0.38",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zereight/mcp-gitlab",
-      "version": "1.0.33",
+      "version": "1.0.38",
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/sdk": "1.8.0",

package.json

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

release-notes.md

@@ -0,0 +1,5 @@
+### 1.0.40 (2025-05-21)
+
+- Added support for listing discussions (comments/notes) on GitLab issues.
+  - Example: You can now easily fetch all conversations (comments) attached to an issue via the API.
+  - Related PR: [#44](https://github.com/zereight/gitlab-mcp/pull/44)

schemas.ts

@@ -107,7 +107,7 @@ export const GitLabRepositorySchema = z.object({
   jobs_enabled: z.boolean().optional(),
   snippets_enabled: z.boolean().optional(),
   can_create_merge_request_in: z.boolean().optional(),
-  resolve_outdated_diff_discussions: z.boolean().optional(),
+  resolve_outdated_diff_discussions: z.boolean().nullable().optional(),
   shared_runners_enabled: z.boolean().optional(),
   shared_with_groups: z
     .array(
@@ -436,13 +436,13 @@ export const GitLabDiscussionNoteSchema = z.object({
         .object({
           start: z.object({
             line_code: z.string(),
-            type: z.enum(["new", "old"]),
+            type: z.enum(["new", "old", "expanded"]),
             old_line: z.number().nullable(),
             new_line: z.number().nullable(),
           }),
           end: z.object({
             line_code: z.string(),
-            type: z.enum(["new", "old"]),
+            type: z.enum(["new", "old", "expanded"]),
             old_line: z.number().nullable(),
             new_line: z.number().nullable(),
           }),
@@ -475,8 +475,36 @@ 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().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"
+});
+
+// Input schema for adding a note to an existing merge request discussion
+export const CreateMergeRequestNoteSchema = ProjectParamsSchema.extend({
+  merge_request_iid: z.number().describe("The IID of a merge request"),
+  discussion_id: z.string().describe("The ID of a thread"),
   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
+  created_at: z.string().optional().describe("Date the note was created at (ISO 8601 format)"),
+});
+
+// Input schema for updating an issue discussion note
+export const UpdateIssueNoteSchema = ProjectParamsSchema.extend({
+  issue_iid: z.number().describe("The IID of an issue"),
+  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"),
+});
+
+// Input schema for adding a note to an existing issue discussion
+export const CreateIssueNoteSchema = ProjectParamsSchema.extend({
+  issue_iid: z.number().describe("The IID of an issue"),
+  discussion_id: z.string().describe("The ID of a thread"),
+  body: z.string().describe("The content of the note or reply"),
+  created_at: z.string().optional().describe("Date the note was created at (ISO 8601 format)"),
 });
 
 // API Operation Parameter Schemas
@@ -745,6 +773,15 @@ export const ListIssueLinksSchema = z.object({
   issue_iid: z.number().describe("The internal ID of a project's issue"),
 });
 
+export const ListIssueDiscussionsSchema = z.object({
+  project_id: z.string().describe("Project ID or URL-encoded path"),
+  issue_iid: z.number().describe("The internal ID of the project issue"),
+  page: z.number().optional().describe("Page number for pagination"),
+  per_page: z.number().optional().describe("Number of items per page"),
+  sort: z.enum(["asc", "desc"]).optional().describe("Return issue discussions sorted in ascending or descending order"),
+  order_by: z.enum(["created_at", "updated_at"]).optional().describe("Return issue discussions ordered by created_at or updated_at fields"),
+});
+
 export const GetIssueLinkSchema = 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"),
@@ -1004,6 +1041,30 @@ export const GitLabWikiPageSchema = z.object({
   updated_at: z.string().optional(),
 });
 
+// Merge Request Thread position schema - used for diff notes
+export const MergeRequestThreadPositionSchema = z.object({
+  base_sha: z.string().describe("Base commit SHA in the source branch"),
+  head_sha: z.string().describe("SHA referencing HEAD of the source branch"),
+  start_sha: z.string().describe("SHA referencing the start commit of the source branch"),
+  position_type: z.enum(["text", "image", "file"]).describe("Type of position reference"),
+  new_path: z.string().optional().describe("File path after change"),
+  old_path: z.string().optional().describe("File path before change"),
+  new_line: z.number().nullable().optional().describe("Line number after change"),
+  old_line: z.number().nullable().optional().describe("Line number before change"),
+  width: z.number().optional().describe("Width of the image (for image diffs)"),
+  height: z.number().optional().describe("Height of the image (for image diffs)"),
+  x: z.number().optional().describe("X coordinate on the image (for image diffs)"),
+  y: z.number().optional().describe("Y coordinate on the image (for image diffs)"),
+});
+
+// Schema for creating a new merge request thread
+export const CreateMergeRequestThreadSchema = ProjectParamsSchema.extend({
+  merge_request_iid: z.number().describe("The IID of a merge request"),
+  body: z.string().describe("The content of the thread"),
+  position: MergeRequestThreadPositionSchema.optional().describe("Position when creating a diff note"),
+  created_at: z.string().optional().describe("Date the thread was created at (ISO 8601 format)"),
+});
+
 // Export types
 export type GitLabAuthor = z.infer<typeof GitLabAuthorSchema>;
 export type GitLabFork = z.infer<typeof GitLabForkSchema>;
@@ -1039,6 +1100,9 @@ export type GitLabMergeRequestDiff = z.infer<
 >;
 export type CreateNoteOptions = z.infer<typeof CreateNoteSchema>;
 export type GitLabIssueLink = z.infer<typeof GitLabIssueLinkSchema>;
+export type ListIssueDiscussionsOptions = z.infer<typeof ListIssueDiscussionsSchema>;
+export type UpdateIssueNoteOptions = z.infer<typeof UpdateIssueNoteSchema>;
+export type CreateIssueNoteOptions = z.infer<typeof CreateIssueNoteSchema>;
 export type GitLabNamespace = z.infer<typeof GitLabNamespaceSchema>;
 export type GitLabNamespaceExistsResponse = z.infer<
   typeof GitLabNamespaceExistsResponseSchema
@@ -1053,3 +1117,6 @@ export type DeleteWikiPageOptions = z.infer<typeof DeleteWikiPageSchema>;
 export type GitLabWikiPage = z.infer<typeof GitLabWikiPageSchema>;
 export type GitLabTreeItem = z.infer<typeof GitLabTreeItemSchema>;
 export type GetRepositoryTreeOptions = z.infer<typeof GetRepositoryTreeSchema>;
+export type MergeRequestThreadPosition = z.infer<typeof MergeRequestThreadPositionSchema>;
+export type CreateMergeRequestThreadOptions = z.infer<typeof CreateMergeRequestThreadSchema>;
+export type CreateMergeRequestNoteOptions = z.infer<typeof CreateMergeRequestNoteSchema>;