@zereight/mcp-gitlab 2.1.56 → 2.1.58

package/build/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { getConfig, ENABLE_DYNAMIC_API_URL, 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_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");
@@ -69,7 +69,7 @@ import fetchCookie from "fetch-cookie";
 import fs from "node:fs";
 import { pipeline as streamPipeline } from "node:stream/promises";
 import os from "node:os";
-import nodeFetch from "node-fetch";
+import { fetch as undiciFetch, File, FormData } from "undici";
 import path from "node:path";
 import { CookieJar, parse as parseCookie } from "tough-cookie";
 import { URL } from "node:url";
@@ -111,7 +111,7 @@ 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, 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, 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, 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";
 import { randomUUID, timingSafeEqual, } from "node:crypto";
 import { createLogger } from "./utils/logger.js";
 const logger = createLogger();
@@ -430,6 +430,7 @@ function createServer() {
                     lastUsed: authData.lastUsed,
                     apiUrl: authData.apiUrl,
                     publicBaseUrl: authData.publicBaseUrl,
+                    allowedProjectIds: authData.allowedProjectIds,
                 };
                 // Run the handler within the retrieved context
                 const result = await sessionAuthStore.run(sessionContext, () => handleToolCall(request.params));
@@ -707,6 +708,10 @@ function validateConfiguration() {
     if (enableDynamicApiUrl && !remoteAuth) {
         errors.push("ENABLE_DYNAMIC_API_URL=true requires REMOTE_AUTHORIZATION=true");
     }
+    const enableDynamicProjectScope = getConfig("enable-dynamic-project-scope", "ENABLE_DYNAMIC_PROJECT_SCOPE") === "true";
+    if (enableDynamicProjectScope && !remoteAuth) {
+        errors.push("ENABLE_DYNAMIC_PROJECT_SCOPE=true requires REMOTE_AUTHORIZATION=true");
+    }
     if (errors.length > 0) {
         logger.error("Configuration validation failed:");
         errors.forEach(err => logger.error(`  - ${err}`));
@@ -913,7 +918,7 @@ function defaultAuthRetryConfig() {
 }
 // Cookie jar and fetch - reloaded when cookie file changes
 let cookieJar = null;
-let fetch = wrapWithAuthRetry(nodeFetch, defaultAuthRetryConfig());
+let fetch = wrapWithAuthRetry(undiciFetch, defaultAuthRetryConfig());
 let lastCookieMtime = 0;
 let cookieReloadLock = null; // Mutex to prevent parallel reloads
 // Auth proxies may redirect and set cookies on the first request. We make a throwaway
@@ -933,7 +938,7 @@ async function reloadCookiesIfChanged() {
                 lastCookieMtime = mtime;
                 const newJar = await createCookieJar();
                 cookieJar = newJar;
-                fetch = wrapWithAuthRetry(newJar ? fetchCookie(nodeFetch, newJar) : nodeFetch, defaultAuthRetryConfig());
+                fetch = wrapWithAuthRetry(newJar ? fetchCookie(undiciFetch, newJar) : undiciFetch, defaultAuthRetryConfig());
                 initialSessionRequestMade = false;
             }
         }
@@ -942,7 +947,7 @@ async function reloadCookiesIfChanged() {
             if (cookieJar) {
                 logger.info("Cookie file removed, clearing cached cookies");
                 cookieJar = null;
-                fetch = wrapWithAuthRetry(nodeFetch, defaultAuthRetryConfig());
+                fetch = wrapWithAuthRetry(undiciFetch, defaultAuthRetryConfig());
                 lastCookieMtime = 0;
                 initialSessionRequestMade = false;
             }
@@ -967,7 +972,8 @@ async function ensureSessionForRequest() {
             redirect: "follow",
         });
         // 401 means auth failed but the request completed - cookies were still exchanged
-        initialSessionRequestMade = response.ok || response.status === 401;
+        // 403 means insufficient scope (e.g. missing User: Read) but auth is valid
+        initialSessionRequestMade = response.ok || response.status === 401 || response.status === 403;
     }
     catch {
         logger.debug("Session warmup request failed, will retry on next request");
@@ -1048,6 +1054,47 @@ function getEffectiveApiUrl() {
     }
     return GITLAB_API_URL;
 }
+/**
+ * Get the effective project allowlist for the current request
+ * In REMOTE_AUTHORIZATION mode with ENABLE_DYNAMIC_PROJECT_SCOPE, reads the scope
+ * narrowed via the X-GitLab-Allowed-Project-Ids header from session context
+ * (already validated against GITLAB_ALLOWED_PROJECT_IDS by parseAuthHeaders)
+ * Otherwise, uses environment GITLAB_ALLOWED_PROJECT_IDS
+ */
+function getEffectiveAllowedProjectIds() {
+    if (ENABLE_DYNAMIC_PROJECT_SCOPE) {
+        const ctx = sessionAuthStore.getStore();
+        if (ctx?.allowedProjectIds && ctx.allowedProjectIds.length > 0) {
+            return ctx.allowedProjectIds;
+        }
+    }
+    return GITLAB_ALLOWED_PROJECT_IDS;
+}
+/**
+ * Reject tools that cannot be limited to allowed projects when
+ * ENABLE_STRICT_PROJECT_SCOPE is set and an allowlist is in effect
+ */
+function rejectIfStrictProjectScope(toolName) {
+    if (ENABLE_STRICT_PROJECT_SCOPE) {
+        rejectIfProjectScopedDeployment(toolName);
+    }
+}
+/**
+ * Filter a project listing down to the effective allowlist
+ * Applies only when ENABLE_STRICT_PROJECT_SCOPE is set and an allowlist is in effect
+ * Allowlist entries may be numeric IDs or full namespace paths
+ */
+function filterProjectsByAllowlist(projects) {
+    if (!ENABLE_STRICT_PROJECT_SCOPE) {
+        return projects;
+    }
+    const allowedProjectIds = getEffectiveAllowedProjectIds();
+    if (allowedProjectIds.length === 0) {
+        return projects;
+    }
+    return projects.filter(project => allowedProjectIds.includes(String(project.id)) ||
+        allowedProjectIds.includes(project.path_with_namespace));
+}
 /**
  * Get fetch configuration with proper client from pool
  * Uses connection pooling when dynamic API URLs are enabled
@@ -1060,10 +1107,10 @@ function getEffectiveApiUrl() {
  */
 const getFetchConfig = () => {
     const effectiveApiUrl = getEffectiveApiUrl();
-    const agent = clientPool.getAgentFunctionForUrl(effectiveApiUrl);
+    const dispatcher = clientPool.getDispatcherForUrl(effectiveApiUrl);
     return {
         headers: { ...BASE_HEADERS, ...buildAuthHeaders() },
-        agent: agent,
+        dispatcher,
     };
 };
 // Compute at startup
@@ -1193,7 +1240,7 @@ if (getPositionalCliCommand(process.argv) !== "auth" &&
  * Utility function for handling GitLab API errors
  * API 에러 처리를 위한 유틸리티 함수 (Utility function for handling API errors)
  *
- * @param {import("node-fetch").Response} response - The response from GitLab API
+ * @param {Response} response - The response from GitLab API
  * @throws {Error} Throws an error with response details if the request failed
  */
 async function handleGitLabError(response) {
@@ -1217,20 +1264,21 @@ async function handleGitLabError(response) {
  * @throws {Error} If GITLAB_ALLOWED_PROJECT_IDS is set and the requested project is not in the whitelist
  */
 function getEffectiveProjectId(projectId) {
-    if (GITLAB_ALLOWED_PROJECT_IDS.length > 0) {
+    const allowedProjectIds = getEffectiveAllowedProjectIds();
+    if (allowedProjectIds.length > 0) {
         // If there's only one allowed project, use it as default
-        if (GITLAB_ALLOWED_PROJECT_IDS.length === 1 && !projectId) {
-            return GITLAB_ALLOWED_PROJECT_IDS[0];
+        if (allowedProjectIds.length === 1 && !projectId) {
+            return allowedProjectIds[0];
         }
         // If a project ID is provided, check if it's in the whitelist
-        if (projectId && !GITLAB_ALLOWED_PROJECT_IDS.includes(projectId)) {
-            throw new Error(`Access denied: Project ${projectId} is not in the allowed project list: ${GITLAB_ALLOWED_PROJECT_IDS.join(", ")}`);
+        if (projectId && !allowedProjectIds.includes(projectId)) {
+            throw new Error(`Access denied: Project ${projectId} is not in the allowed project list: ${allowedProjectIds.join(", ")}`);
         }
         // If no project ID provided but we have multiple allowed projects, require an explicit choice
-        if (!projectId && GITLAB_ALLOWED_PROJECT_IDS.length > 1) {
-            throw new Error(`Multiple projects allowed (${GITLAB_ALLOWED_PROJECT_IDS.join(", ")}). Please specify a project ID.`);
+        if (!projectId && allowedProjectIds.length > 1) {
+            throw new Error(`Multiple projects allowed (${allowedProjectIds.join(", ")}). Please specify a project ID.`);
         }
-        return projectId || GITLAB_ALLOWED_PROJECT_IDS[0];
+        return projectId || allowedProjectIds[0];
     }
     // Prioritize the passed projectId over GITLAB_PROJECT_ID to allow querying different projects
     if (projectId) {
@@ -1245,8 +1293,8 @@ function rejectIfProjectScopedDeployment(toolName) {
     if (GITLAB_PROJECT_ID) {
         throw new Error(`${toolName} is not allowed when GITLAB_PROJECT_ID is set (server is locked to a single project)`);
     }
-    if (GITLAB_ALLOWED_PROJECT_IDS.length > 0) {
-        throw new Error(`${toolName} is not allowed when GITLAB_ALLOWED_PROJECT_IDS is set (server access is restricted to configured projects)`);
+    if (getEffectiveAllowedProjectIds().length > 0) {
+        throw new Error(`${toolName} is not allowed while a project allowlist is in effect (GITLAB_ALLOWED_PROJECT_IDS or a session scope restricts access to configured projects)`);
     }
 }
 /**
@@ -1390,9 +1438,11 @@ async function createIssue(projectId, options) {
  */
 async function listIssues(projectId, options = {}) {
     let url;
-    if (projectId) {
-        projectId = decodeURIComponent(projectId); // Decode project ID
-        const effectiveProjectId = getEffectiveProjectId(projectId);
+    if (projectId || (ENABLE_STRICT_PROJECT_SCOPE && getEffectiveAllowedProjectIds().length > 0)) {
+        // In strict scope, never fall back to the instance-wide endpoint;
+        // resolve the default project (or fail for a multi-project allowlist)
+        const decodedProjectId = projectId ? decodeURIComponent(projectId) : "";
+        const effectiveProjectId = getEffectiveProjectId(decodedProjectId);
         url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(effectiveProjectId)}/issues`);
     }
     else {
@@ -1486,11 +1536,18 @@ function appendMergeRequestFilters(url, options) {
  * @returns {Promise<GitLabMergeRequest[]>} List of merge requests
  */
 async function listMergeRequests(projectId, options = {}) {
-    const decodedProjectId = projectId ? decodeURIComponent(projectId) : undefined;
-    const endpoint = decodedProjectId
-        ? `${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(decodedProjectId))}/merge_requests`
-        : `${getEffectiveApiUrl()}/merge_requests`;
-    const url = new URL(endpoint);
+    const decodedProjectId = projectId ? decodeURIComponent(projectId) : "";
+    let url;
+    if (decodedProjectId ||
+        (ENABLE_STRICT_PROJECT_SCOPE && getEffectiveAllowedProjectIds().length > 0)) {
+        // In strict scope, never fall back to the instance-wide endpoint;
+        // resolve the default project (or fail for a multi-project allowlist)
+        const effectiveProjectId = getEffectiveProjectId(decodedProjectId);
+        url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(effectiveProjectId)}/merge_requests`);
+    }
+    else {
+        url = new URL(`${getEffectiveApiUrl()}/merge_requests`);
+    }
     appendMergeRequestFilters(url, options);
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
@@ -2179,8 +2236,8 @@ async function resolveProjectOrGroupPath(projectId) {
     const namespaceMatch = decodedProjectId.match(/^(group|project):(.+)$/i);
     const explicitKind = namespaceMatch?.[1]?.toLowerCase();
     const requestedProjectId = namespaceMatch ? namespaceMatch[2] : decodedProjectId;
-    if (explicitKind === "group" && GITLAB_ALLOWED_PROJECT_IDS.length > 0) {
-        throw new Error("group:<id-or-path> cannot be used when GITLAB_ALLOWED_PROJECT_IDS is set, because the project allowlist does not cover groups");
+    if (explicitKind === "group" && getEffectiveAllowedProjectIds().length > 0) {
+        throw new Error("group:<id-or-path> cannot be used while a project allowlist is in effect (GITLAB_ALLOWED_PROJECT_IDS or a session scope), because the project allowlist does not cover groups");
     }
     const effectiveProjectId = getEffectiveProjectId(requestedProjectId);
     if (explicitKind === "group") {
@@ -2202,7 +2259,7 @@ async function resolveProjectOrGroupPath(projectId) {
     // resolving to an unrelated group with the same integer ID.
     if (projectResponse.status === 404 &&
         !explicitKind &&
-        GITLAB_ALLOWED_PROJECT_IDS.length === 0 &&
+        getEffectiveAllowedProjectIds().length === 0 &&
         !/^\d+$/.test(effectiveProjectId)) {
         const groupUrl = new URL(`${getEffectiveApiUrl()}/groups/${encodeURIComponent(effectiveProjectId)}`);
         const groupResponse = await fetch(groupUrl.toString(), {
@@ -3522,14 +3579,19 @@ async function searchProjects(query, page = 1, perPage = 20) {
         const errorBody = await response.text();
         throw new Error(`GitLab API error: ${response.status} ${response.statusText}\n${errorBody}`);
     }
-    const projects = (await response.json());
+    const unfiltered = (await response.json());
+    const projects = filterProjectsByAllowlist(unfiltered);
     const totalCount = response.headers.get("x-total");
     const totalPages = response.headers.get("x-total-pages");
-    // GitLab API doesn't return these headers for results > 10,000
+    const nextPage = response.headers.get("x-next-page");
+    // GitLab API doesn't return the total headers for results > 10,000
+    // Keep the unfiltered totals so callers paginate past pages the allowlist filter thinned out;
+    // without them, total_pages stays unset and next_page carries the continuation signal
     const count = totalCount ? Number.parseInt(totalCount, 10) : projects.length;
     return GitLabSearchResponseSchema.parse({
         count,
-        total_pages: totalPages ? Number.parseInt(totalPages, 10) : Math.ceil(count / perPage),
+        total_pages: totalPages ? Number.parseInt(totalPages, 10) : undefined,
+        next_page: nextPage ? Number.parseInt(nextPage, 10) : undefined,
         current_page: page,
         items: projects,
     });
@@ -4623,7 +4685,7 @@ async function listProjects(options = {}) {
     await handleGitLabError(response);
     // Parse and return the data
     const data = await response.json();
-    return z.array(GitLabProjectSchema).parse(data);
+    return filterProjectsByAllowlist(z.array(GitLabProjectSchema).parse(data));
 }
 /**
  * List labels for a project
@@ -4789,7 +4851,7 @@ async function listGroupProjects(options) {
     });
     await handleGitLabError(response);
     const projects = await response.json();
-    return GitLabProjectSchema.array().parse(projects);
+    return filterProjectsByAllowlist(GitLabProjectSchema.array().parse(projects));
 }
 // Webhook API helper functions
 /**
@@ -4800,6 +4862,7 @@ function buildWebhookBaseUrl(projectId, groupId) {
         projectId = decodeURIComponent(projectId);
         return `${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/hooks`;
     }
+    rejectIfStrictProjectScope("group webhooks");
     const decodedGroupId = decodeURIComponent(groupId);
     return `${getEffectiveApiUrl()}/groups/${encodeURIComponent(decodedGroupId)}/hooks`;
 }
@@ -4816,6 +4879,54 @@ async function listWebhooks(options) {
     await handleGitLabError(response);
     return (await response.json());
 }
+function buildWebhookMutationBody(options) {
+    const body = {};
+    for (const [key, value] of Object.entries(options)) {
+        if (key === "project_id" || key === "group_id" || key === "hook_id")
+            continue;
+        if (value !== undefined)
+            body[key] = value;
+    }
+    return body;
+}
+/**
+ * Create a webhook on a project or group
+ */
+async function createWebhook(options) {
+    const url = buildWebhookBaseUrl(options.project_id, options.group_id);
+    const response = await fetch(url, {
+        ...getFetchConfig(),
+        method: "POST",
+        body: JSON.stringify(buildWebhookMutationBody(options)),
+    });
+    await handleGitLabError(response);
+    return await response.json();
+}
+/**
+ * Update a webhook on a project or group
+ */
+async function updateWebhook(options) {
+    const url = `${buildWebhookBaseUrl(options.project_id, options.group_id)}/${options.hook_id}`;
+    const response = await fetch(url, {
+        ...getFetchConfig(),
+        method: "PUT",
+        body: JSON.stringify(buildWebhookMutationBody(options)),
+    });
+    await handleGitLabError(response);
+    return await response.json();
+}
+/**
+ * Delete a webhook from a project or group
+ */
+async function deleteWebhook(options) {
+    const url = `${buildWebhookBaseUrl(options.project_id, options.group_id)}/${options.hook_id}`;
+    const response = await fetch(url, {
+        ...getFetchConfig(),
+        method: "DELETE",
+    });
+    await handleGitLabError(response);
+    return { status: "deleted", hook_id: options.hook_id };
+}
 /**
  * Fetch a single page of webhook events
  */
@@ -6765,15 +6876,16 @@ async function resolveProjectFullPath(projectId) {
  * Allowlist entries may be numeric IDs or full namespace paths.
  */
 function assertVulnerabilityProjectAllowed(vulnerabilityId, project) {
-    if (GITLAB_ALLOWED_PROJECT_IDS.length === 0) {
+    const allowedProjectIds = getEffectiveAllowedProjectIds();
+    if (allowedProjectIds.length === 0) {
         return;
     }
     const fullPath = project?.fullPath ?? undefined;
     const numericId = project?.id?.match(/^gid:\/\/gitlab\/Project\/(\d+)$/)?.[1];
-    const allowed = (fullPath !== undefined && GITLAB_ALLOWED_PROJECT_IDS.includes(fullPath)) ||
-        (numericId !== undefined && GITLAB_ALLOWED_PROJECT_IDS.includes(numericId));
+    const allowed = (fullPath !== undefined && allowedProjectIds.includes(fullPath)) ||
+        (numericId !== undefined && allowedProjectIds.includes(numericId));
     if (!allowed) {
-        throw new Error(`Access denied: Vulnerability ${vulnerabilityId} belongs to project ${fullPath ?? numericId ?? "unknown"}, which is not in the allowed project list: ${GITLAB_ALLOWED_PROJECT_IDS.join(", ")}`);
+        throw new Error(`Access denied: Vulnerability ${vulnerabilityId} belongs to project ${fullPath ?? numericId ?? "unknown"}, which is not in the allowed project list: ${allowedProjectIds.join(", ")}`);
     }
 }
 /**
@@ -6783,7 +6895,7 @@ function assertVulnerabilityProjectAllowed(vulnerabilityId, project) {
  * is not configured.
  */
 async function ensureVulnerabilityProjectAllowed(vulnerabilityId) {
-    if (GITLAB_ALLOWED_PROJECT_IDS.length === 0) {
+    if (getEffectiveAllowedProjectIds().length === 0) {
         return;
     }
     const data = await executeGraphQL(`query getVulnerabilityProject($id: VulnerabilityID!) {
@@ -7015,15 +7127,11 @@ async function markdownUpload(projectId, filePath, content, filename) {
         throw new Error("Either file_path or content must be provided");
     }
     // Create form data
-    const FormData = (await import("form-data")).default;
     const form = new FormData();
-    form.append("file", fileBuffer, {
-        filename: fileName,
-        contentType: "application/octet-stream",
-    });
+    form.append("file", new File([fileBuffer], fileName, { type: "application/octet-stream" }));
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(effectiveProjectId)}/uploads`);
     const defaultFetchConfig = getFetchConfig();
-    delete defaultFetchConfig.headers["Content-Type"]; // Let form-data set the correct Content-Type with boundary
+    delete defaultFetchConfig.headers["Content-Type"];
     const response = await fetch(url.toString(), {
         ...defaultFetchConfig,
         method: "POST",
@@ -7514,6 +7622,7 @@ async function handleToolCall(params) {
                 };
             }
             case "search_code": {
+                rejectIfStrictProjectScope("search_code");
                 const args = SearchCodeSchema.parse(params.arguments);
                 const results = await searchBlobs({
                     search: args.search,
@@ -7544,6 +7653,7 @@ async function handleToolCall(params) {
                 };
             }
             case "search_group_code": {
+                rejectIfStrictProjectScope("search_group_code");
                 const args = SearchGroupCodeSchema.parse(params.arguments);
                 const results = await searchBlobs({
                     search: args.search,
@@ -7806,6 +7916,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_todos": {
+                rejectIfStrictProjectScope("list_todos");
                 const args = ListTodosSchema.parse(params.arguments);
                 const todos = await listTodos(args);
                 return {
@@ -7813,6 +7924,7 @@ async function handleToolCall(params) {
                 };
             }
             case "mark_todo_done": {
+                rejectIfStrictProjectScope("mark_todo_done");
                 const args = MarkTodoDoneSchema.parse(params.arguments);
                 const todo = await markTodoDone(args.id);
                 return {
@@ -7820,6 +7932,7 @@ async function handleToolCall(params) {
                 };
             }
             case "mark_all_todos_done": {
+                rejectIfStrictProjectScope("mark_all_todos_done");
                 MarkAllTodosDoneSchema.parse(params.arguments);
                 await markAllTodosDone();
                 return {
@@ -8071,6 +8184,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_group_members": {
+                rejectIfStrictProjectScope("list_group_members");
                 const args = ListGroupMembersSchema.parse(params.arguments);
                 const { group_id, ...options } = args;
                 const members = await listGroupMembers(group_id, options);
@@ -8593,6 +8707,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_group_wiki_pages": {
+                rejectIfStrictProjectScope("list_group_wiki_pages");
                 const { group_id, page, per_page, with_content, render_html } = ListGroupWikiPagesSchema.parse(params.arguments);
                 const wikiPages = await listGroupWikiPages(group_id, {
                     page,
@@ -8605,6 +8720,7 @@ async function handleToolCall(params) {
                 };
             }
             case "get_group_wiki_page": {
+                rejectIfStrictProjectScope("get_group_wiki_page");
                 const { group_id, slug, render_html } = GetGroupWikiPageSchema.parse(params.arguments);
                 const wikiPage = await getGroupWikiPage(group_id, slug, render_html);
                 return {
@@ -8612,6 +8728,7 @@ async function handleToolCall(params) {
                 };
             }
             case "create_group_wiki_page": {
+                rejectIfStrictProjectScope("create_group_wiki_page");
                 const { group_id, title, content, format } = CreateGroupWikiPageSchema.parse(params.arguments);
                 const wikiPage = await createGroupWikiPage(group_id, title, content, format);
                 return {
@@ -8619,6 +8736,7 @@ async function handleToolCall(params) {
                 };
             }
             case "update_group_wiki_page": {
+                rejectIfStrictProjectScope("update_group_wiki_page");
                 const { group_id, slug, title, content, format } = UpdateGroupWikiPageSchema.parse(params.arguments);
                 const wikiPage = await updateGroupWikiPage(group_id, slug, title, content, format);
                 return {
@@ -8626,6 +8744,7 @@ async function handleToolCall(params) {
                 };
             }
             case "delete_group_wiki_page": {
+                rejectIfStrictProjectScope("delete_group_wiki_page");
                 const { group_id, slug } = DeleteGroupWikiPageSchema.parse(params.arguments);
                 await deleteGroupWikiPage(group_id, slug);
                 return {
@@ -9148,6 +9267,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_group_merge_requests": {
+                rejectIfStrictProjectScope("list_group_merge_requests");
                 const { group_id, ...options } = ListGroupMergeRequestsSchema.parse(params.arguments);
                 const cleanedOptions = cleanMutuallyExclusiveIdUsernameOptions(options, LIST_MERGE_REQUESTS_ID_USERNAME_PAIRS);
                 const mergeRequests = await listGroupMergeRequests(group_id, cleanedOptions);
@@ -9267,6 +9387,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_group_milestones": {
+                rejectIfStrictProjectScope("list_group_milestones");
                 const { group_id, ...options } = ListGroupMilestonesSchema.parse(params.arguments);
                 const milestones = await listGroupMilestones(group_id, options);
                 return {
@@ -9279,6 +9400,7 @@ async function handleToolCall(params) {
                 };
             }
             case "get_group_milestone": {
+                rejectIfStrictProjectScope("get_group_milestone");
                 const { group_id, milestone_id } = GetGroupMilestoneSchema.parse(params.arguments);
                 const milestone = await getGroupMilestone(group_id, milestone_id);
                 return {
@@ -9291,6 +9413,7 @@ async function handleToolCall(params) {
                 };
             }
             case "create_group_milestone": {
+                rejectIfStrictProjectScope("create_group_milestone");
                 const { group_id, ...options } = CreateGroupMilestoneSchema.parse(params.arguments);
                 const milestone = await createGroupMilestone(group_id, options);
                 return {
@@ -9303,6 +9426,7 @@ async function handleToolCall(params) {
                 };
             }
             case "edit_group_milestone": {
+                rejectIfStrictProjectScope("edit_group_milestone");
                 const { group_id, milestone_id, ...options } = EditGroupMilestoneSchema.parse(params.arguments);
                 const milestone = await editGroupMilestone(group_id, milestone_id, options);
                 return {
@@ -9315,6 +9439,7 @@ async function handleToolCall(params) {
                 };
             }
             case "delete_group_milestone": {
+                rejectIfStrictProjectScope("delete_group_milestone");
                 const { group_id, milestone_id } = DeleteGroupMilestoneSchema.parse(params.arguments);
                 await deleteGroupMilestone(group_id, milestone_id);
                 return {
@@ -9330,6 +9455,7 @@ async function handleToolCall(params) {
                 };
             }
             case "get_group_milestone_issue": {
+                rejectIfStrictProjectScope("get_group_milestone_issue");
                 const { group_id, milestone_id, ...options } = GetGroupMilestoneIssuesSchema.parse(params.arguments);
                 const issues = await getGroupMilestoneIssues(group_id, milestone_id, options);
                 return {
@@ -9342,6 +9468,7 @@ async function handleToolCall(params) {
                 };
             }
             case "get_group_milestone_merge_requests": {
+                rejectIfStrictProjectScope("get_group_milestone_merge_requests");
                 const { group_id, milestone_id, ...options } = GetGroupMilestoneMergeRequestsSchema.parse(params.arguments);
                 const mergeRequests = await getGroupMilestoneMergeRequests(group_id, milestone_id, options);
                 return {
@@ -9354,6 +9481,7 @@ async function handleToolCall(params) {
                 };
             }
             case "get_group_milestone_burndown_events": {
+                rejectIfStrictProjectScope("get_group_milestone_burndown_events");
                 const { group_id, milestone_id, ...options } = GetGroupMilestoneBurndownEventsSchema.parse(params.arguments);
                 const events = await getGroupMilestoneBurndownEvents(group_id, milestone_id, options);
                 return {
@@ -9411,6 +9539,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_group_iterations": {
+                rejectIfStrictProjectScope("list_group_iterations");
                 const args = ListGroupIterationsSchema.parse(params.arguments);
                 const iterations = await listGroupIterations(args.group_id, args);
                 return {
@@ -9609,6 +9738,7 @@ async function handleToolCall(params) {
                 };
             }
             case "list_events": {
+                rejectIfStrictProjectScope("list_events");
                 const args = ListEventsSchema.parse(params.arguments);
                 const events = await listEvents(args);
                 return {
@@ -9744,6 +9874,27 @@ async function handleToolCall(params) {
                     content: [{ type: "text", text: JSON.stringify(webhooks) }],
                 };
             }
+            case "create_webhook": {
+                const args = CreateWebhookSchema.parse(params.arguments);
+                const webhook = await createWebhook(args);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(webhook) }],
+                };
+            }
+            case "update_webhook": {
+                const args = UpdateWebhookSchema.parse(params.arguments);
+                const webhook = await updateWebhook(args);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(webhook) }],
+                };
+            }
+            case "delete_webhook": {
+                const args = DeleteWebhookSchema.parse(params.arguments);
+                const result = await deleteWebhook(args);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(result) }],
+                };
+            }
             case "list_webhook_events": {
                 const args = ListWebhookEventsSchema.parse(params.arguments);
                 const events = await listWebhookEvents(args);
@@ -9981,8 +10132,8 @@ function buildDownloadProxyDeps() {
         encodeGitLabPathSegment,
         encodeGitLabPath,
         getEffectiveProjectId,
-        getAgentFunctionForUrl: clientPool.getAgentFunctionForUrl.bind(clientPool),
-        fetch: nodeFetch,
+        getDispatcherForUrl: clientPool.getDispatcherForUrl.bind(clientPool),
+        fetch: undiciFetch,
         logger,
     };
 }
@@ -10183,7 +10334,28 @@ async function startStreamableHTTPServer() {
         const privateToken = req.headers["private-token"] || "";
         const jobToken = req.headers["job-token"] || "";
         const dynamicApiUrl = req.headers["x-gitlab-api-url"]?.trim();
+        const requestedProjectScope = req.headers["x-gitlab-allowed-project-ids"]?.trim();
         let apiUrl = GITLAB_API_URL; // Default API URL
+        let allowedProjectIds;
+        // Only process the requested project scope if the feature is enabled
+        if (ENABLE_DYNAMIC_PROJECT_SCOPE && requestedProjectScope !== undefined) {
+            const requested = requestedProjectScope
+                .split(",")
+                .map(id => id.trim())
+                .filter(Boolean);
+            if (requested.length === 0) {
+                logger.warn("Empty X-GitLab-Allowed-Project-Ids provided");
+                return null;
+            }
+            if (GITLAB_ALLOWED_PROJECT_IDS.length > 0) {
+                const outOfScope = requested.filter(id => !GITLAB_ALLOWED_PROJECT_IDS.includes(id));
+                if (outOfScope.length > 0) {
+                    logger.warn(`X-GitLab-Allowed-Project-Ids requested projects outside GITLAB_ALLOWED_PROJECT_IDS: ${outOfScope.join(", ")}`);
+                    return null; // Reject if the header tries to widen the configured allowlist
+                }
+            }
+            allowedProjectIds = requested;
+        }
         // Only process dynamic URL if the feature is enabled
         if (ENABLE_DYNAMIC_API_URL && dynamicApiUrl) {
             try {
@@ -10219,7 +10391,7 @@ async function startStreamableHTTPServer() {
         }
         // Validate token and return AuthData object
         if (token && header && validateToken(token)) {
-            return { header, token, lastUsed: Date.now(), apiUrl };
+            return { header, token, lastUsed: Date.now(), apiUrl, allowedProjectIds };
         }
         return null;
     };
@@ -10369,6 +10541,7 @@ async function startStreamableHTTPServer() {
                 header: headerAuth.header,
                 token: headerAuth.token,
                 apiUrl: headerAuth.apiUrl,
+                allowedProjectIds: headerAuth.allowedProjectIds,
             };
             freshAuthPresent = true;
         }
@@ -10397,7 +10570,12 @@ async function startStreamableHTTPServer() {
             if (looksLikeStatelessSessionId(incomingSid)) {
                 const opened = openSessionId(material, incomingSid, sessionTtlSeconds);
                 if (opened) {
-                    effective = { header: opened.h, token: opened.t, apiUrl: opened.u };
+                    effective = {
+                        header: opened.h,
+                        token: opened.t,
+                        apiUrl: opened.u,
+                        allowedProjectIds: opened.p,
+                    };
                     metrics.statelessAuthFromSealedSid++;
                 }
                 else {
@@ -10443,6 +10621,7 @@ async function startStreamableHTTPServer() {
             header: effective.header,
             token: effective.token,
             apiUrl: effective.apiUrl,
+            allowedProjectIds: effective.allowedProjectIds,
         });
         if (freshAuthPresent) {
             metrics.statelessSidRotated++;
@@ -10461,6 +10640,7 @@ async function startStreamableHTTPServer() {
             lastUsed: Date.now(),
             apiUrl: effective.apiUrl,
             publicBaseUrl: getForwardedPublicBaseUrl(req, MCP_TRUST_PROXY),
+            allowedProjectIds: effective.allowedProjectIds,
         };
         // Step 4: create a fresh transport per request.
         // DNS rebinding protection is enforced by requireMcpHostAndOrigin middleware;
@@ -10987,6 +11167,7 @@ async function startStreamableHTTPServer() {
                 lastUsed: authData.lastUsed,
                 apiUrl: authData.apiUrl,
                 publicBaseUrl: authData.publicBaseUrl,
+                allowedProjectIds: authData.allowedProjectIds,
             };
             // Run the entire request handling within AsyncLocalStorage context
             await sessionAuthStore.run(ctx, handleRequest);
@@ -11065,6 +11246,7 @@ async function startStreamableHTTPServer() {
                     lastUsed: authData.lastUsed,
                     apiUrl: authData.apiUrl,
                     publicBaseUrl: authData.publicBaseUrl,
+                    allowedProjectIds: authData.allowedProjectIds,
                 };
                 await sessionAuthStore.run(ctx, handleGetRequest);
             }