From 7e0afc1a7a466d713e8e9df7f7bf43848197e204 Mon Sep 17 00:00:00 2001
From: Mohsen Madani <mohsen.madani@chaptergroup.net>
Date: Sat, 23 May 2026 14:36:24 +0330
Subject: [PATCH] feat: Update MergeRequestDiscussions to use
 MergeRequestDiscussionSchema for type consistency

---
 .../src/resources/MergeRequestDiscussions.ts     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/resources/MergeRequestDiscussions.ts b/packages/core/src/resources/MergeRequestDiscussions.ts
index 20ccc199e..21d013772 100644
--- a/packages/core/src/resources/MergeRequestDiscussions.ts
+++ b/packages/core/src/resources/MergeRequestDiscussions.ts
@@ -25,6 +25,10 @@ export interface MergeRequestDiscussionNoteSchema extends DiscussionNoteSchema {
   position?: DiscussionNotePositionSchema;
 }
 
+export interface MergeRequestDiscussionSchema extends DiscussionSchema {
+  notes?: MergeRequestDiscussionNoteSchema[];
+}
+
 export type MergeRequestDiscussionNotePositionOptions = {
   lineRange?: {
     start?: {
@@ -51,7 +55,7 @@ export interface MergeRequestDiscussions<C extends boolean = false> extends Reso
     projectId: string | number,
     mergerequestId: string | number,
     options?: BaseRequestSearchParams & PaginationRequestOptions<P> & ShowExpanded<E> & Sudo,
-  ): Promise<GitlabAPIResponse<DiscussionSchema[], C, E, P>>;
+  ): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema[], C, E, P>>;
 
   create<E extends boolean = false>(
     projectId: string | number,
@@ -63,7 +67,7 @@ export interface MergeRequestDiscussions<C extends boolean = false> extends Reso
       createdAt?: string;
     } & ShowExpanded<E> &
       Sudo,
-  ): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>>;
+  ): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>>;
 
   editNote<E extends boolean = false>(
     projectId: string | number,
@@ -87,14 +91,14 @@ export interface MergeRequestDiscussions<C extends boolean = false> extends Reso
     discussionId: string,
     resolve: boolean,
     options?: ShowExpanded<E> & Sudo,
-  ): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>>;
+  ): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>>;
 
   show<E extends boolean = false>(
     projectId: string | number,
     mergerequestId: string | number,
     discussionId: string,
     options?: ShowExpanded<E> & Sudo,
-  ): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>>;
+  ): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>>;
 }
 
 export class MergeRequestDiscussions<C extends boolean = false> extends ResourceDiscussions<C> {
@@ -109,10 +113,10 @@ export class MergeRequestDiscussions<C extends boolean = false> extends Resource
     discussionId: string,
     resolved: boolean,
     options?: ShowExpanded<E> & Sudo,
-  ): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>> {
+  ): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>> {
     const { sudo, showExpanded } = options || {};
 
-    return RequestHelper.put<DiscussionSchema>()(
+    return RequestHelper.put<MergeRequestDiscussionSchema>()(
       this,
       endpoint`${projectId}/merge_requests/${mergerequestId}/discussions/${discussionId}`,
       {