@zereight/mcp-gitlab 2.1.62 → 2.1.64

package/build/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { getConfig, ENABLE_DYNAMIC_API_URL, ENABLE_DYNAMIC_PROJECT_SCOPE, ENABLE_STRICT_PROJECT_SCOPE, GITLAB_AUTH_COOKIE_PATH, GITLAB_ALLOW_UNAUTHENTICATED_TOOL_DISCOVERY, GITLAB_CA_CERT_PATH, GITLAB_JOB_TOKEN, GITLAB_MCP_OAUTH, GITLAB_OAUTH_APP_ID, GITLAB_OAUTH_SCOPES, GITLAB_OAUTH_CALLBACK_PROXY, GITLAB_PERSONAL_ACCESS_TOKEN, GITLAB_POOL_MAX_SIZE, GITLAB_DISABLE_VERSION_CHECK, GITLAB_READ_ONLY_MODE, GITLAB_PERMISSION_MODE, GITLAB_TOOLSETS_RAW, GITLAB_TOOLS_RAW, HOST, HTTP_PROXY, HTTPS_PROXY, IS_OLD, MCP_SERVER_URL, NODE_TLS_REJECT_UNAUTHORIZED, NO_PROXY, OAUTH_STATELESS_CLIENT_TTL_SECONDS, OAUTH_STATELESS_MODE, OAUTH_STATELESS_PENDING_TTL_SECONDS, OAUTH_STATELESS_SESSION_TTL_SECONDS, OAUTH_STATELESS_STORED_TTL_SECONDS, PORT, REMOTE_AUTHORIZATION, SESSION_TIMEOUT_SECONDS, SSE, STREAMABLE_HTTP, MCP_TRUST_PROXY, USE_GITLAB_WIKI, USE_MILESTONE, USE_OAUTH, USE_PIPELINE, GITLAB_TOOL_POLICY_APPROVE_RAW, GITLAB_TOOL_POLICY_HIDDEN_RAW, GITLAB_OAUTH_ALLOWED_GROUPS_RAW, GITLAB_ALLOWED_GROUPS_RAW, GITLAB_OAUTH_ALLOWED_GROUPS, } from "./config.js";
+import { getConfig, ENABLE_DYNAMIC_API_URL, ENABLE_DYNAMIC_PROJECT_SCOPE, ENABLE_STRICT_PROJECT_SCOPE, GITLAB_AUTH_COOKIE_PATH, GITLAB_ALLOW_UNAUTHENTICATED_TOOL_DISCOVERY, GITLAB_CA_CERT_PATH, GITLAB_JOB_TOKEN, GITLAB_MCP_OAUTH, GITLAB_OAUTH_APP_ID, GITLAB_OAUTH_SCOPES, GITLAB_OAUTH_CALLBACK_PROXY, GITLAB_PERSONAL_ACCESS_TOKEN, GITLAB_POOL_MAX_SIZE, GITLAB_DISABLE_VERSION_CHECK, GITLAB_READ_ONLY_MODE, GITLAB_MASKING_ENABLED, GITLAB_MASKING_CONFIG, GITLAB_MASKING_POLICY_FILE, GITLAB_MASKING_WORKSPACE_DIR, GITLAB_PERMISSION_MODE, GITLAB_TOOLSETS_RAW, GITLAB_TOOLS_RAW, HOST, HTTP_PROXY, HTTPS_PROXY, IS_OLD, MCP_SERVER_URL, NODE_TLS_REJECT_UNAUTHORIZED, NO_PROXY, OAUTH_STATELESS_CLIENT_TTL_SECONDS, OAUTH_STATELESS_MODE, OAUTH_STATELESS_PENDING_TTL_SECONDS, OAUTH_STATELESS_SESSION_TTL_SECONDS, OAUTH_STATELESS_STORED_TTL_SECONDS, PORT, REMOTE_AUTHORIZATION, SESSION_TIMEOUT_SECONDS, SSE, STREAMABLE_HTTP, MCP_TRUST_PROXY, USE_GITLAB_WIKI, USE_MILESTONE, USE_OAUTH, USE_PIPELINE, GITLAB_TOOL_POLICY_APPROVE_RAW, GITLAB_TOOL_POLICY_HIDDEN_RAW, GITLAB_OAUTH_ALLOWED_GROUPS_RAW, GITLAB_ALLOWED_GROUPS_RAW, GITLAB_OAUTH_ALLOWED_GROUPS, } from "./config.js";
 /** True when the server is running in remote/network mode (SSE or StreamableHTTP transport). */
 const IS_REMOTE = SSE || STREAMABLE_HTTP;
 const STREAMABLE_HTTP_AUTH_TOKEN = getConfig("streamable-http-auth-token", "STREAMABLE_HTTP_AUTH_TOKEN");
@@ -95,11 +95,12 @@ import { graphqlQueryContainsWriteOperation, graphqlQueryContainsDeleteOperation
 import { resolveNestedWikiUpdateTitle } from "./utils/wiki-title.js";
 import { encodeRepoFilePayloadContent, fileOperationsIncludeDeleteOrMove, toGitLabCommitActions, } from "./utils/gitlab-commit-actions.js";
 import { redactSensitiveGitLabFields } from "./utils/redact-sensitive.js";
+import { createMaskingPolicyResolver, getManagedMaskingProjectIds, } from "./masking/index.js";
 import { checkForNewVersion } from "./utils/version-check.js";
 import { assertGitLabVersionAtLeast } from "./utils/gitlab-version-gate.js";
 import { parseGitLabVersionApiResponse, } from "./utils/gitlab-instance-version.js";
 import { buildBulkPublishDraftNotesBody, needsGitLab19_2BulkPublish, } from "./utils/bulk-publish-options.js";
-import { cleanMutuallyExclusiveIdUsernameOptions, LIST_MERGE_REQUESTS_ID_USERNAME_PAIRS, sanitizeToolArguments, } from "./utils/tool-args.js";
+import { appendFilterParam, appendFilterParams, cleanMutuallyExclusiveIdUsernameOptions, dropBlankArrayEntries, isBlankFilterValue, LIST_MERGE_REQUESTS_ID_USERNAME_PAIRS, sanitizeToolArguments, } from "./utils/tool-args.js";
 import { parseSearchReplaceBlocks, applySearchReplace, applyUnifiedDiff, } from "./utils/patch-helper.js";
 import { requireBearerAuth } from "@modelcontextprotocol/sdk/server/auth/middleware/bearerAuth.js";
 import { GitLabClientPool } from "./gitlab-client-pool.js";
@@ -111,10 +112,18 @@ GitLabDiscussionNoteSchema, // Added
 GitLabDiscussionSchema, 
 // Draft Notes Schemas
 GitLabDraftNoteSchema, GitLabForkSchema, GitLabBranchSchema, GitLabProtectedBranchSchema, GitLabGroupSchema, GitLabIssueLinkSchema, GitLabIssueSchema, GitLabIssueWithLinkDetailsSchema, GitLabMarkdownUploadSchema, GitLabMergeRequestPipelineSchema, GitLabMergeRequestSchema, GitLabMilestonesSchema, GitLabGroupMilestonesSchema, GitLabNamespaceExistsResponseSchema, GitLabNamespaceSchema, GitLabPipelineJobSchema, GitLabDeploymentSchema, GitLabEnvironmentSchema, GitLabPipelineSchema, GitLabPipelineScheduleSchema, GitLabPipelineScheduleVariableSchema, GitLabPipelineSchedulePlayResultSchema, ListPipelineSchedulesSchema, GetPipelineScheduleSchema, ListPipelineSchedulePipelinesSchema, CreatePipelineScheduleSchema, UpdatePipelineScheduleSchema, DeletePipelineScheduleSchema, PlayPipelineScheduleSchema, TakeOwnershipPipelineScheduleSchema, GetPipelineScheduleVariableSchema, CreatePipelineScheduleVariableSchema, UpdatePipelineScheduleVariableSchema, DeletePipelineScheduleVariableSchema, GitLabPipelineTriggerJobSchema, GitLabProjectMemberSchema, GitLabProjectSchema, GitLabTodoSchema, GitLabReferenceSchema, GitLabRepositorySchema, GitLabSearchBlobResultSchema, GitLabSearchResponseSchema, GitLabTreeItemSchema, GitLabUserSchema, GitLabUsersResponseSchema, GitLabWikiPageSchema, GroupIteration, ListCommitStatusesSchema, ListBranchesSchema, ListCommitsSchema, ListDraftNotesSchema, ListGroupIterationsSchema, ListGroupProjectsSchema, GitLabCiVariableSchema, ListProjectVariablesSchema, GetProjectVariableSchema, CreateProjectVariableSchema, UpdateProjectVariableSchema, DeleteProjectVariableSchema, ListGroupVariablesSchema, GetGroupVariableSchema, CreateGroupVariableSchema, UpdateGroupVariableSchema, DeleteGroupVariableSchema, GitLabDependencyProxySchema, GitLabDependencyProxyBlobSchema, GetDependencyProxySettingsSchema, UpdateDependencyProxySettingsSchema, ListDependencyProxyBlobsSchema, PurgeDependencyProxyCacheSchema, ListProjectVulnerabilitiesSchema, GetVulnerabilitySchema, DismissVulnerabilitySchema, ConfirmVulnerabilitySchema, ListIssueDiscussionsSchema, ListIssueLinksSchema, ListIssuesSchema, ListTodosSchema, ListLabelsSchema, ListMergeRequestDiffsSchema, // Added
-GetMergeRequestFileDiffSchema, ListMergeRequestChangedFilesSchema, ListMergeRequestDiscussionsSchema, ListMergeRequestPipelinesSchema, ListMergeRequestsSchema, ListGroupMergeRequestsSchema, ListMergeRequestVersionsSchema, GetMergeRequestVersionSchema, GitLabMergeRequestVersionSchema, GitLabMergeRequestVersionDetailSchema, ListNamespacesSchema, ListPipelineJobsSchema, ListPipelinesSchema, ListDeploymentsSchema, ListEnvironmentsSchema, ListPipelineTriggerJobsSchema, ValidateCiLintSchema, ValidateProjectCiLintSchema, ListCiCatalogResourcesSchema, GetCiCatalogResourceSchema, ListProjectMembersSchema, ListGroupMembersSchema, ListProjectMilestonesSchema, ListGroupMilestonesSchema, ListProjectsSchema, ListWikiPagesSchema, GetGroupWikiPageSchema, ListGroupWikiPagesSchema, UpdateGroupWikiPageSchema, MarkdownUploadSchema, MarkdownUploadRemoteSchema, DownloadAttachmentSchema, DownloadJobArtifactsSchema, GetJobArtifactFileSchema, GitLabArtifactEntrySchema, ListJobArtifactsSchema, MergeMergeRequestSchema, ApproveMergeRequestSchema, UnapproveMergeRequestSchema, GetMergeRequestApprovalStateSchema, GetMergeRequestConflictsSchema, GitLabMergeRequestApprovalsResponseSchema, GitLabMergeRequestApprovalStateSchema, MyIssuesSchema, OrbitQuerySchema, OrbitSchemaSchema, OrbitStatusSchema, OrbitToolsSchema, MarkAllTodosDoneSchema, MarkTodoDoneSchema, PaginatedDiscussionsResponseSchema, PromoteProjectMilestoneSchema, PublishDraftNoteSchema, PlayPipelineJobSchema, PushFilesSchema, RetryPipelineJobSchema, RetryPipelineSchema, SearchCodeSchema, SearchGroupCodeSchema, SearchProjectCodeSchema, SearchRepositoriesSchema, UpdateDraftNoteSchema, UpdateIssueNoteSchema, UpdateIssueSchema, UpdateIssueDescriptionPatchSchema, UpdateLabelSchema, UpdateProjectSchema, UpdateMergeRequestNoteSchema, UpdateMergeRequestDiscussionNoteSchema, UpdateMergeRequestSchema, UpdateWikiPageSchema, VerifyNamespaceSchema, GitLabEventSchema, ListEventsSchema, GetProjectEventsSchema, ExecuteGraphQLSchema, GitLabReleaseSchema, ListReleasesSchema, GetReleaseSchema, CreateReleaseSchema, UpdateReleaseSchema, DeleteReleaseSchema, CreateReleaseEvidenceSchema, DownloadReleaseAssetSchema, ListTagsSchema, GetTagSchema, CreateTagSchema, DeleteTagSchema, GetTagSignatureSchema, GitLabTagSchema, GitLabTagSignatureSchema, GetMergeRequestNotesSchema, GetMergeRequestNoteSchema, DeleteMergeRequestDiscussionNoteSchema, ResolveMergeRequestThreadSchema, GetWorkItemSchema, ListWorkItemsSchema, CreateWorkItemSchema, UpdateWorkItemSchema, ConvertWorkItemTypeSchema, ListWorkItemStatusesSchema, ListWorkItemNotesSchema, CreateWorkItemNoteSchema, CreateWorkItemEmojiReactionSchema, CreateWorkItemNoteEmojiReactionSchema, ListWorkItemEmojiReactionsSchema, ListWorkItemNoteEmojiReactionsSchema, DeleteWorkItemEmojiReactionSchema, DeleteWorkItemNoteEmojiReactionSchema, MoveWorkItemSchema, ListCustomFieldDefinitionsSchema, GetTimelineEventsSchema, CreateTimelineEventSchema, ListWebhooksSchema, CreateWebhookSchema, UpdateWebhookSchema, DeleteWebhookSchema, ListWebhookEventsSchema, GetWebhookEventSchema, HealthCheckSchema, } from "./schemas.js";
+GetMergeRequestFileDiffSchema, ListMergeRequestChangedFilesSchema, ListMergeRequestDiscussionsSchema, ListMergeRequestPipelinesSchema, ListMergeRequestsSchema, ListGroupMergeRequestsSchema, ListMergeRequestVersionsSchema, GetMergeRequestVersionSchema, GitLabMergeRequestVersionSchema, GitLabMergeRequestVersionDetailSchema, ListNamespacesSchema, ListPipelineJobsSchema, ListPipelinesSchema, ListDeploymentsSchema, ListEnvironmentsSchema, ListPipelineTriggerJobsSchema, ValidateCiLintSchema, ValidateProjectCiLintSchema, ListCiCatalogResourcesSchema, GetCiCatalogResourceSchema, ListProjectMembersSchema, ListGroupMembersSchema, ListProjectMilestonesSchema, ListGroupMilestonesSchema, ListProjectsSchema, ListWikiPagesSchema, GetGroupWikiPageSchema, ListGroupWikiPagesSchema, UpdateGroupWikiPageSchema, MarkdownUploadSchema, MarkdownUploadRemoteSchema, DownloadAttachmentSchema, DownloadJobArtifactsSchema, GetJobArtifactFileSchema, GitLabArtifactEntrySchema, ListJobArtifactsSchema, MergeMergeRequestSchema, ApproveMergeRequestSchema, UnapproveMergeRequestSchema, GetMergeRequestApprovalStateSchema, GetMergeRequestConflictsSchema, GitLabMergeRequestApprovalsResponseSchema, GitLabMergeRequestApprovalStateSchema, MyIssuesSchema, OrbitQuerySchema, OrbitSchemaSchema, OrbitStatusSchema, OrbitToolsSchema, MarkAllTodosDoneSchema, MarkTodoDoneSchema, PaginatedDiscussionsResponseSchema, PromoteProjectMilestoneSchema, PublishDraftNoteSchema, PlayPipelineJobSchema, PushFilesSchema, RetryPipelineJobSchema, RetryPipelineSchema, SearchCodeSchema, SearchGroupCodeSchema, SearchProjectCodeSchema, SearchRepositoriesSchema, UpdateDraftNoteSchema, UpdateIssueNoteSchema, UpdateIssueSchema, UpdateIssueDescriptionPatchSchema, UpdateLabelSchema, UpdateProjectSchema, UpdateMergeRequestNoteSchema, UpdateMergeRequestDiscussionNoteSchema, UpdateMergeRequestSchema, UpdateWikiPageSchema, VerifyNamespaceSchema, GitLabEventSchema, ListEventsSchema, GetProjectEventsSchema, ExecuteGraphQLSchema, GitLabReleaseSchema, ListReleasesSchema, GetReleaseSchema, CreateReleaseSchema, UpdateReleaseSchema, DeleteReleaseSchema, CreateReleaseEvidenceSchema, DownloadReleaseAssetSchema, ListTagsSchema, GetTagSchema, CreateTagSchema, DeleteTagSchema, GetTagSignatureSchema, GitLabTagSchema, GitLabTagSignatureSchema, GetMergeRequestNotesSchema, GetMergeRequestNoteSchema, GetMergeRequestDiscussionSchema, DeleteMergeRequestDiscussionNoteSchema, ResolveMergeRequestThreadSchema, GetWorkItemSchema, ListWorkItemsSchema, CreateWorkItemSchema, UpdateWorkItemSchema, ConvertWorkItemTypeSchema, ListWorkItemStatusesSchema, ListWorkItemNotesSchema, CreateWorkItemNoteSchema, CreateWorkItemEmojiReactionSchema, CreateWorkItemNoteEmojiReactionSchema, ListWorkItemEmojiReactionsSchema, ListWorkItemNoteEmojiReactionsSchema, DeleteWorkItemEmojiReactionSchema, DeleteWorkItemNoteEmojiReactionSchema, MoveWorkItemSchema, ListCustomFieldDefinitionsSchema, GetTimelineEventsSchema, CreateTimelineEventSchema, ListWebhooksSchema, CreateWebhookSchema, UpdateWebhookSchema, DeleteWebhookSchema, ListWebhookEventsSchema, GetWebhookEventSchema, HealthCheckSchema, } from "./schemas.js";
 import { randomUUID, timingSafeEqual, } from "node:crypto";
 import { createLogger } from "./utils/logger.js";
 const logger = createLogger();
+// Construct once at startup. When disabled this is undefined and the result
+// path below returns the original objects without reading a config file.
+const maskingPolicyResolver = createMaskingPolicyResolver({
+    enabled: GITLAB_MASKING_ENABLED,
+    configPath: GITLAB_MASKING_CONFIG,
+    policyFilePath: GITLAB_MASKING_POLICY_FILE,
+    workspaceDir: GITLAB_MASKING_WORKSPACE_DIR,
+});
 const SERVER_NAME = process.env.MCP_SERVER_NAME?.trim() || "zereight-gitlab-mcp-server";
 /**
  * Static MCP prompt catalog. These wrap the multi-step tool workflows documented in
@@ -292,22 +301,74 @@ function createServer() {
         const sessionId = request.params.sessionId;
         const toolName = request.params.name;
         const start = Date.now();
+        let maskingEngine;
         const logCompletion = (result) => {
             const durationMs = Date.now() - start;
             logger.info({ tool: toolName, event: "tool_call_done", durationMs }, `tool_call_done: ${toolName} (${durationMs}ms)`);
-            return result;
+            const isPlainTextResult = toolName === "get_pipeline_job_output" ||
+                toolName === "get_job_artifact_file" ||
+                (toolName === "download_release_asset" && !IS_REMOTE);
+            return maskingEngine
+                ? maskingEngine.maskToolResult(result, { textFormat: isPlainTextResult ? "plain" : "json" })
+                : result;
         };
         const logError = (error) => {
             const durationMs = Date.now() - start;
+            const safeError = maskingEngine ? maskingEngine.maskError(error) : error;
             logger.error({
                 tool: toolName,
                 event: "tool_call_error",
                 durationMs,
-                error: error instanceof Error ? error.message : String(error),
+                error: safeError instanceof Error ? safeError.message : String(safeError),
             }, `tool_call_error: ${toolName} (${durationMs}ms)`);
-            throw error;
+            throw safeError;
         };
         try {
+            const authData = (REMOTE_AUTHORIZATION || GITLAB_MCP_OAUTH) && sessionId
+                ? authBySession[sessionId]
+                : undefined;
+            const sessionContext = authData
+                ? {
+                    sessionId,
+                    header: authData.header,
+                    token: authData.token,
+                    lastUsed: authData.lastUsed,
+                    apiUrl: authData.apiUrl,
+                    publicBaseUrl: authData.publicBaseUrl,
+                    allowedProjectIds: authData.allowedProjectIds,
+                }
+                : undefined;
+            const selectMaskingPolicy = () => {
+                const isToolDiscovery = toolName === "discover_tools";
+                const inputSchema = allTools.find(tool => tool.name === toolName)?.inputSchema;
+                // Optional project fields can be filters on global queries. Only supply
+                // the default when the corresponding handler actually uses it. Keep this
+                // list synchronized with getFileContents, listMyIssues, listIssues, and
+                // listMergeRequests: those are the handlers with optional project input
+                // that may call getEffectiveProjectId("") at runtime.
+                const usesDefaultProject = inputSchema?.required?.includes("project_id") ||
+                    toolName === "get_file_contents" ||
+                    (toolName === "my_issues" &&
+                        (Boolean(GITLAB_PROJECT_ID) || getEffectiveAllowedProjectIds().length > 0)) ||
+                    ((toolName === "list_issues" || toolName === "list_merge_requests") &&
+                        ENABLE_STRICT_PROJECT_SCOPE &&
+                        getEffectiveAllowedProjectIds().length > 0);
+                const maskingScope = maskingPolicyResolver
+                    ? getManagedMaskingProjectIds(inputSchema, request.params.arguments, maskingPolicyResolver.managed && usesDefaultProject
+                        ? () => getEffectiveProjectId("")
+                        : undefined)
+                    : undefined;
+                return maskingPolicyResolver?.select({
+                    gitlabInstance: getEffectiveApiUrl(),
+                    ...maskingScope,
+                    // Tool discovery does not access GitLab data and must remain available
+                    // under the default managed-policy setting.
+                    allowBuiltinForUnscoped: isToolDiscovery,
+                });
+            };
+            maskingEngine = sessionContext
+                ? sessionAuthStore.run(sessionContext, selectMaskingPolicy)
+                : selectMaskingPolicy();
             // Handle discover_tools meta-tool directly (needs access to mcpServer and filteredTools)
             if (toolName === "discover_tools") {
                 const category = request.params.arguments?.category?.trim()?.toLowerCase();
@@ -421,18 +482,9 @@ function createServer() {
                 const { _confirmed, ...cleanArgs } = request.params.arguments || {};
                 request.params.arguments = cleanArgs;
             }
-            if ((REMOTE_AUTHORIZATION || GITLAB_MCP_OAUTH) && sessionId && authBySession[sessionId]) {
-                const authData = authBySession[sessionId];
-                const sessionContext = {
-                    sessionId,
-                    header: authData.header,
-                    token: authData.token,
-                    lastUsed: authData.lastUsed,
-                    apiUrl: authData.apiUrl,
-                    publicBaseUrl: authData.publicBaseUrl,
-                    allowedProjectIds: authData.allowedProjectIds,
-                };
-                // Run the handler within the retrieved context
+            if (sessionContext) {
+                // Policy selection and the tool handler must use the same request-local
+                // API URL and project allowlist.
                 const result = await sessionAuthStore.run(sessionContext, () => handleToolCall(request.params));
                 return logCompletion(result);
             }
@@ -1248,13 +1300,17 @@ async function handleGitLabError(response) {
         const errorBody = await response.text();
         // Check specifically for Rate Limit error
         if (response.status === 403 && errorBody.includes("User API Key Rate limit exceeded")) {
-            logger.error({ err: errorBody }, "GitLab API Rate Limit Exceeded");
+            // Do not log the upstream body here; it is masked on the error object
+            // before the common tool-call boundary returns/logs it.
+            logger.error("GitLab API Rate Limit Exceeded");
             logger.error("User API Key Rate limit exceeded. Please try again later.");
-            throw new Error(`GitLab API Rate Limit Exceeded: ${errorBody}`);
+            const error = new Error(`GitLab API Rate Limit Exceeded: ${errorBody}`);
+            throw error;
         }
         else {
             // Handle other API errors
-            throw new Error(`GitLab API error: ${response.status} ${response.statusText}\n${errorBody}`);
+            const error = new Error(`GitLab API error: ${response.status} ${response.statusText}\n${errorBody}`);
+            throw error;
         }
     }
 }
@@ -1450,23 +1506,26 @@ async function listIssues(projectId, options = {}) {
     }
     // Add all query parameters
     Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            const keys = ["labels", "assignee_username"];
-            if (keys.includes(key)) {
-                if (Array.isArray(value)) {
-                    // Handle array of labels
-                    value.forEach(label => {
-                        url.searchParams.append(`${key}[]`, label.toString());
-                    });
-                }
-                else if (value) {
-                    url.searchParams.append(`${key}[]`, value.toString());
-                }
+        // Drop blank entries inside arrays so ["", "bug"] behaves like the scalar guard below
+        const normalized = dropBlankArrayEntries(value);
+        if (isBlankFilterValue(normalized)) {
+            return;
+        }
+        const keys = ["labels", "assignee_username"];
+        if (keys.includes(key)) {
+            if (Array.isArray(normalized)) {
+                // Handle array of labels
+                normalized.forEach(label => {
+                    url.searchParams.append(`${key}[]`, String(label));
+                });
             }
             else {
-                url.searchParams.append(key, String(value));
+                url.searchParams.append(`${key}[]`, String(normalized));
             }
         }
+        else {
+            url.searchParams.append(key, String(normalized));
+        }
     });
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
@@ -1477,11 +1536,7 @@ async function listIssues(projectId, options = {}) {
 }
 async function listTodos(options = {}) {
     const url = new URL(`${getEffectiveApiUrl()}/todos`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -1510,20 +1565,22 @@ async function markAllTodosDone() {
  */
 function appendMergeRequestFilters(url, options) {
     Object.entries(options).forEach(([key, value]) => {
-        if (value === undefined) {
+        // Drop blank entries inside arrays so ["", "bug"] behaves like the scalar guard below
+        const normalized = dropBlankArrayEntries(value);
+        if (isBlankFilterValue(normalized)) {
             return;
         }
-        if (key === "labels" && Array.isArray(value)) {
-            url.searchParams.append(key, value.join(","));
+        if (key === "labels" && Array.isArray(normalized)) {
+            url.searchParams.append(key, normalized.join(","));
         }
-        else if (key === "approved_by_usernames" && Array.isArray(value)) {
+        else if (key === "approved_by_usernames" && Array.isArray(normalized)) {
             // GitLab expects array-bracket form: approved_by_usernames[]=alice&approved_by_usernames[]=bob
-            for (const v of value) {
+            for (const v of normalized) {
                 url.searchParams.append(`${key}[]`, String(v));
             }
         }
         else {
-            url.searchParams.append(key, String(value));
+            url.searchParams.append(key, String(normalized));
         }
     });
 }
@@ -3408,6 +3465,17 @@ async function getMergeRequestNote(projectId, mergeRequestIid, noteId) {
     const data = await response.json();
     return GitLabDiscussionNoteSchema.parse(data);
 }
+async function getMergeRequestDiscussion(projectId, mergeRequestIid, discussionId) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${encodeGitLabPathSegment(mergeRequestIid)}/discussions/${encodeGitLabPathSegment(discussionId)}`);
+    const response = await fetch(url.toString(), {
+        ...getFetchConfig(),
+        method: "GET",
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabDiscussionSchema.parse(data);
+}
 async function getMergeRequestNotes(projectId, mergeRequestIid, sort, order_by, per_page, page) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${encodeGitLabPathSegment(mergeRequestIid)}/notes`);
@@ -3733,11 +3801,7 @@ async function getMergeRequestSourceCommitCount(projectId, mergeRequestIid) {
 async function listMergeRequestPipelines(projectId, mergeRequestIid, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${encodeGitLabPathSegment(mergeRequestIid)}/pipelines`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -4667,16 +4731,7 @@ async function getMergeRequestVersion(projectId, mergeRequestIid, versionId, uni
 async function listProjects(options = {}) {
     // Construct the query parameters
     const params = new URLSearchParams();
-    for (const [key, value] of Object.entries(options)) {
-        if (value !== undefined && value !== null) {
-            if (typeof value === "boolean") {
-                params.append(key, value ? "true" : "false");
-            }
-            else {
-                params.append(key, String(value));
-            }
-        }
-    }
+    appendFilterParams(params, options);
     // Make the API request
     const response = await fetch(`${getEffectiveApiUrl()}/projects?${params.toString()}`, {
         ...getFetchConfig(),
@@ -4699,16 +4754,7 @@ async function listLabels(projectId, options = {}) {
     // Construct the URL with project path
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/labels`);
     // Add query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (typeof value === "boolean") {
-                url.searchParams.append(key, value ? "true" : "false");
-            }
-            else {
-                url.searchParams.append(key, String(value));
-            }
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     // Make the API request
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
@@ -5165,11 +5211,7 @@ async function listPipelines(projectId, options = {}) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipelines`);
     // Add all query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5243,11 +5285,7 @@ async function updatePipelineMetadata(projectId, pipelineId, name) {
 async function listDeployments(projectId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/deployments`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5299,11 +5337,7 @@ async function deploymentRequest(projectId, path = "", method = "GET", body, que
 async function listEnvironments(projectId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/environments`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5373,16 +5407,7 @@ async function listPipelineJobs(projectId, pipelineId, options = {}) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipelines/${encodeGitLabPathSegment(pipelineId)}/jobs`);
     // Add all query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (typeof value === "boolean") {
-                url.searchParams.append(key, value ? "true" : "false");
-            }
-            else {
-                url.searchParams.append(key, value.toString());
-            }
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5405,16 +5430,7 @@ async function listPipelineTriggerJobs(projectId, pipelineId, options = {}) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipelines/${encodeGitLabPathSegment(pipelineId)}/bridges`);
     // Add all query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (typeof value === "boolean") {
-                url.searchParams.append(key, value ? "true" : "false");
-            }
-            else {
-                url.searchParams.append(key, value.toString());
-            }
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5499,16 +5515,7 @@ async function validateCiLint(projectId, options) {
 async function validateProjectCiLint(projectId, options) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/ci/lint`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (typeof value === "boolean") {
-                url.searchParams.append(key, value ? "true" : "false");
-            }
-            else {
-                url.searchParams.append(key, value.toString());
-            }
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5527,16 +5534,7 @@ async function validateProjectCiLint(projectId, options) {
 async function listJobArtifacts(projectId, jobId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/jobs/${encodeGitLabPathSegment(jobId)}/artifacts/tree`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (typeof value === "boolean") {
-                url.searchParams.append(key, value ? "true" : "false");
-            }
-            else {
-                url.searchParams.append(key, value.toString());
-            }
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5673,11 +5671,7 @@ async function cancelPipeline(projectId, pipelineId) {
 async function listPipelineSchedules(projectId, options = {}) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipeline_schedules`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -5713,11 +5707,7 @@ async function getPipelineSchedule(projectId, pipelineScheduleId) {
 async function listPipelineSchedulePipelines(projectId, pipelineScheduleId, options = {}) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipeline_schedules/${encodeGitLabPathSegment(pipelineScheduleId)}/pipelines`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6040,15 +6030,18 @@ async function listProjectMilestones(projectId, options) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/milestones`);
     Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (key === "iids" && Array.isArray(value) && value.length > 0) {
-                value.forEach(iid => {
-                    url.searchParams.append("iids[]", iid.toString());
-                });
-            }
-            else if (value !== undefined) {
-                url.searchParams.append(key, value.toString());
-            }
+        // Drop blank entries inside arrays so they behave like the scalar blank guard below
+        const normalized = dropBlankArrayEntries(value);
+        if (isBlankFilterValue(normalized)) {
+            return;
+        }
+        if (key === "iids" && Array.isArray(normalized)) {
+            normalized.forEach(iid => {
+                url.searchParams.append("iids[]", String(iid));
+            });
+        }
+        else {
+            url.searchParams.append(key, String(normalized));
         }
     });
     const response = await fetch(url.toString(), {
@@ -6135,11 +6128,7 @@ async function deleteProjectMilestone(projectId, milestoneId) {
 async function getMilestoneIssues(projectId, milestoneId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/milestones/${encodeGitLabPathSegment(milestoneId)}/issues`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6156,11 +6145,7 @@ async function getMilestoneIssues(projectId, milestoneId, options = {}) {
 async function getMilestoneMergeRequests(projectId, milestoneId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/milestones/${encodeGitLabPathSegment(milestoneId)}/merge_requests`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6194,11 +6179,7 @@ async function promoteProjectMilestone(projectId, milestoneId) {
 async function getMilestoneBurndownEvents(projectId, milestoneId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/milestones/${encodeGitLabPathSegment(milestoneId)}/burndown_events`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6213,15 +6194,18 @@ async function listGroupMilestones(groupId, options) {
     groupId = decodeURIComponent(groupId);
     const url = new URL(`${getEffectiveApiUrl()}/groups/${encodeURIComponent(groupId)}/milestones`);
     Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            if (key === "iids" && Array.isArray(value) && value.length > 0) {
-                value.forEach(iid => {
-                    url.searchParams.append("iids[]", iid.toString());
-                });
-            }
-            else {
-                url.searchParams.append(key, value.toString());
-            }
+        // Drop blank entries inside arrays so they behave like the scalar blank guard below
+        const normalized = dropBlankArrayEntries(value);
+        if (isBlankFilterValue(normalized)) {
+            return;
+        }
+        if (key === "iids" && Array.isArray(normalized)) {
+            normalized.forEach(iid => {
+                url.searchParams.append("iids[]", String(iid));
+            });
+        }
+        else {
+            url.searchParams.append(key, String(normalized));
         }
     });
     const response = await fetch(url.toString(), {
@@ -6292,11 +6276,7 @@ async function deleteGroupMilestone(groupId, milestoneId) {
 async function getGroupMilestoneIssues(groupId, milestoneId, options = {}) {
     groupId = decodeURIComponent(groupId);
     const url = new URL(`${getEffectiveApiUrl()}/groups/${encodeURIComponent(groupId)}/milestones/${encodeGitLabPathSegment(milestoneId)}/issues`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6310,11 +6290,7 @@ async function getGroupMilestoneIssues(groupId, milestoneId, options = {}) {
 async function getGroupMilestoneMergeRequests(groupId, milestoneId, options = {}) {
     groupId = decodeURIComponent(groupId);
     const url = new URL(`${getEffectiveApiUrl()}/groups/${encodeURIComponent(groupId)}/milestones/${encodeGitLabPathSegment(milestoneId)}/merge_requests`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6328,11 +6304,7 @@ async function getGroupMilestoneMergeRequests(groupId, milestoneId, options = {}
 async function getGroupMilestoneBurndownEvents(groupId, milestoneId, options = {}) {
     groupId = decodeURIComponent(groupId);
     const url = new URL(`${getEffectiveApiUrl()}/groups/${encodeURIComponent(groupId)}/milestones/${encodeGitLabPathSegment(milestoneId)}/burndown_events`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, String(value));
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6531,11 +6503,7 @@ async function getFileBlame(projectId, options) {
 async function listCommitStatuses(projectId, sha, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/repository/commits/${encodeURIComponent(sha)}/statuses`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -6557,11 +6525,7 @@ async function createCommitStatus(projectId, sha, options) {
     }
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/statuses/${encodeURIComponent(sha)}`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
         method: "POST",
@@ -6739,19 +6703,13 @@ async function listProjectVariables(projectId, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/variables`);
     Object.entries(options).forEach(([key, value]) => {
-        if (value === undefined)
-            return;
         if (key === "filter" && typeof value === "object" && value !== null) {
-            Object.entries(value).forEach(([fKey, fVal]) => {
-                url.searchParams.append(`filter[${fKey}]`, fVal);
+            Object.entries(value).forEach(([filterKey, filterValue]) => {
+                appendFilterParam(url.searchParams, `filter[${filterKey}]`, filterValue);
             });
+            return;
         }
-        else if (typeof value === "boolean") {
-            url.searchParams.append(key, value ? "true" : "false");
-        }
-        else {
-            url.searchParams.append(key, String(value));
-        }
+        appendFilterParam(url.searchParams, key, value);
     });
     const response = await fetch(url.toString(), getFetchConfig());
     await handleGitLabError(response);
@@ -6805,19 +6763,13 @@ async function listGroupVariables(groupId, options = {}) {
     const encoded = encodeURIComponent(decodeURIComponent(groupId));
     const url = new URL(`${getEffectiveApiUrl()}/groups/${encoded}/variables`);
     Object.entries(options).forEach(([key, value]) => {
-        if (value === undefined)
-            return;
         if (key === "filter" && typeof value === "object" && value !== null) {
-            Object.entries(value).forEach(([fKey, fVal]) => {
-                url.searchParams.append(`filter[${fKey}]`, fVal);
+            Object.entries(value).forEach(([filterKey, filterValue]) => {
+                appendFilterParam(url.searchParams, `filter[${filterKey}]`, filterValue);
             });
+            return;
         }
-        else if (typeof value === "boolean") {
-            url.searchParams.append(key, value ? "true" : "false");
-        }
-        else {
-            url.searchParams.append(key, String(value));
-        }
+        appendFilterParam(url.searchParams, key, value);
     });
     const response = await fetch(url.toString(), getFetchConfig());
     await handleGitLabError(response);
@@ -7364,11 +7316,7 @@ async function downloadAttachment(projectId, secret, filename, localPath) {
 async function listEvents(options = {}) {
     const url = new URL(`${getEffectiveApiUrl()}/events`);
     // Add all query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), { ...getFetchConfig() });
     if (!response.ok) {
         await handleGitLabError(response);
@@ -7386,11 +7334,7 @@ async function getProjectEvents(projectId, options = {}) {
     const effectiveProjectId = getEffectiveProjectId(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(effectiveProjectId)}/events`);
     // Add all query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), { ...getFetchConfig() });
     if (!response.ok) {
         await handleGitLabError(response);
@@ -7409,11 +7353,7 @@ async function listReleases(projectId, options = {}) {
     const effectiveProjectId = getEffectiveProjectId(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(effectiveProjectId)}/releases`);
     // Add query parameters
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -7536,11 +7476,7 @@ async function downloadReleaseAsset(projectId, tagName, directAssetPath) {
 async function listTags(projectId, options = {}) {
     const effectiveProjectId = getEffectiveProjectId(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(effectiveProjectId)}/repository/tags`);
-    Object.entries(options).forEach(([key, value]) => {
-        if (value !== undefined) {
-            url.searchParams.append(key, value.toString());
-        }
-    });
+    appendFilterParams(url.searchParams, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
     });
@@ -7957,6 +7893,13 @@ async function handleToolCall(params) {
                     content: [{ type: "text", text: JSON.stringify(note) }],
                 };
             }
+            case "get_merge_request_discussion": {
+                const args = GetMergeRequestDiscussionSchema.parse(params.arguments);
+                const discussion = await getMergeRequestDiscussion(args.project_id, args.merge_request_iid, args.discussion_id);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(discussion) }],
+                };
+            }
             case "get_merge_request_notes": {
                 const args = GetMergeRequestNotesSchema.parse(params.arguments);
                 const notes = await getMergeRequestNotes(args.project_id, args.merge_request_iid, args.sort, args.order_by, args.per_page, args.page);
@@ -8773,8 +8716,8 @@ async function handleToolCall(params) {
                 };
             }
             case "list_labels": {
-                const args = ListLabelsSchema.parse(params.arguments);
-                const labels = await listLabels(args.project_id, args);
+                const { project_id, ...options } = ListLabelsSchema.parse(params.arguments);
+                const labels = await listLabels(project_id, options);
                 return {
                     content: [{ type: "text", text: JSON.stringify(labels) }],
                 };