@zereight/mcp-gitlab 2.0.7 → 2.0.9

package/build/index.js

@@ -4,6 +4,7 @@ import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { AsyncLocalStorage } from "async_hooks";
 import express from "express";
 import fetchCookie from "fetch-cookie";
 import fs from "fs";
@@ -21,7 +22,7 @@ import { Agent } from "http";
 import { Agent as HttpsAgent } from "https";
 import { URL } from "url";
 import { BulkPublishDraftNotesSchema, CancelPipelineJobSchema, CancelPipelineSchema, CreateBranchSchema, CreateDraftNoteSchema, CreateIssueLinkSchema, CreateIssueNoteSchema, CreateIssueSchema, CreateLabelSchema, // Added
-CreateMergeRequestNoteSchema, CreateMergeRequestSchema, CreateMergeRequestThreadSchema, CreateNoteSchema, CreateOrUpdateFileSchema, CreatePipelineSchema, CreateProjectMilestoneSchema, CreateRepositorySchema, CreateWikiPageSchema, DeleteDraftNoteSchema, DeleteIssueLinkSchema, DeleteIssueSchema, DeleteLabelSchema, DeleteProjectMilestoneSchema, DeleteWikiPageSchema, EditProjectMilestoneSchema, ForkRepositorySchema, GetBranchDiffsSchema, GetCommitDiffSchema, GetCommitSchema, GetDraftNoteSchema, GetFileContentsSchema, GetIssueLinkSchema, GetIssueSchema, GetLabelSchema, GetMergeRequestDiffsSchema, GetMergeRequestSchema, GetMilestoneBurndownEventsSchema, GetMilestoneIssuesSchema, GetMilestoneMergeRequestsSchema, GetNamespaceSchema, 
+CreateMergeRequestNoteSchema, CreateMergeRequestDiscussionNoteSchema, CreateMergeRequestSchema, CreateMergeRequestThreadSchema, CreateNoteSchema, CreateOrUpdateFileSchema, CreatePipelineSchema, CreateProjectMilestoneSchema, CreateRepositorySchema, CreateWikiPageSchema, DeleteDraftNoteSchema, DeleteIssueLinkSchema, DeleteIssueSchema, DeleteLabelSchema, DeleteProjectMilestoneSchema, DeleteWikiPageSchema, DeleteMergeRequestNoteSchema, EditProjectMilestoneSchema, ForkRepositorySchema, GetBranchDiffsSchema, GetCommitDiffSchema, GetCommitSchema, GetDraftNoteSchema, GetFileContentsSchema, GetIssueLinkSchema, GetIssueSchema, GetLabelSchema, GetMergeRequestDiffsSchema, GetMergeRequestSchema, GetMilestoneBurndownEventsSchema, GetMilestoneIssuesSchema, GetMilestoneMergeRequestsSchema, GetNamespaceSchema, 
 // pipeline job schemas
 GetPipelineJobOutputSchema, GetPipelineSchema, GetProjectMilestoneSchema, GetProjectSchema, GetRepositoryTreeSchema, GetUsersSchema, GetWikiPageSchema, GitLabCommitSchema, GitLabCompareResultSchema, GitLabContentSchema, GitLabCreateUpdateFileResponseSchema, GitLabDiffSchema, 
 // Discussion Schemas
@@ -29,7 +30,7 @@ GitLabDiscussionNoteSchema, // Added
 GitLabDiscussionSchema, 
 // Draft Notes Schemas
 GitLabDraftNoteSchema, GitLabForkSchema, GitLabIssueLinkSchema, GitLabIssueSchema, GitLabIssueWithLinkDetailsSchema, GitLabMarkdownUploadSchema, GitLabMergeRequestSchema, GitLabMilestonesSchema, GitLabNamespaceExistsResponseSchema, GitLabNamespaceSchema, GitLabPipelineJobSchema, GitLabPipelineSchema, GitLabPipelineTriggerJobSchema, GitLabProjectMemberSchema, GitLabProjectSchema, GitLabReferenceSchema, GitLabRepositorySchema, GitLabSearchResponseSchema, GitLabTreeItemSchema, GitLabTreeSchema, GitLabUserSchema, GitLabUsersResponseSchema, GitLabWikiPageSchema, GroupIteration, ListCommitsSchema, ListDraftNotesSchema, ListGroupIterationsSchema, ListGroupProjectsSchema, ListIssueDiscussionsSchema, ListIssueLinksSchema, ListIssuesSchema, ListLabelsSchema, ListMergeRequestDiffsSchema, // Added
-ListMergeRequestDiscussionsSchema, ListMergeRequestsSchema, ListNamespacesSchema, ListPipelineJobsSchema, ListPipelinesSchema, ListPipelineTriggerJobsSchema, ListProjectMembersSchema, ListProjectMilestonesSchema, ListProjectsSchema, ListWikiPagesSchema, MarkdownUploadSchema, DownloadAttachmentSchema, MergeMergeRequestSchema, MyIssuesSchema, PaginatedDiscussionsResponseSchema, PromoteProjectMilestoneSchema, PublishDraftNoteSchema, PlayPipelineJobSchema, PushFilesSchema, RetryPipelineJobSchema, RetryPipelineSchema, SearchRepositoriesSchema, UpdateDraftNoteSchema, UpdateIssueNoteSchema, UpdateIssueSchema, UpdateLabelSchema, UpdateMergeRequestNoteSchema, UpdateMergeRequestSchema, UpdateWikiPageSchema, VerifyNamespaceSchema, GitLabEventSchema, ListEventsSchema, GetProjectEventsSchema, ExecuteGraphQLSchema } from "./schemas.js";
+ListMergeRequestDiscussionsSchema, ListMergeRequestsSchema, ListNamespacesSchema, ListPipelineJobsSchema, ListPipelinesSchema, ListPipelineTriggerJobsSchema, ListProjectMembersSchema, ListProjectMilestonesSchema, ListProjectsSchema, ListWikiPagesSchema, MarkdownUploadSchema, DownloadAttachmentSchema, MergeMergeRequestSchema, MyIssuesSchema, PaginatedDiscussionsResponseSchema, PromoteProjectMilestoneSchema, PublishDraftNoteSchema, PlayPipelineJobSchema, PushFilesSchema, RetryPipelineJobSchema, RetryPipelineSchema, SearchRepositoriesSchema, UpdateDraftNoteSchema, UpdateIssueNoteSchema, UpdateIssueSchema, UpdateLabelSchema, UpdateMergeRequestNoteSchema, UpdateMergeRequestDiscussionNoteSchema, UpdateMergeRequestSchema, UpdateWikiPageSchema, VerifyNamespaceSchema, GitLabEventSchema, ListEventsSchema, GetProjectEventsSchema, ExecuteGraphQLSchema, GitLabReleaseSchema, ListReleasesSchema, GetReleaseSchema, CreateReleaseSchema, UpdateReleaseSchema, DeleteReleaseSchema, CreateReleaseEvidenceSchema, DownloadReleaseAssetSchema, GetMergeRequestNotesSchema, GetMergeRequestNoteSchema, DeleteMergeRequestDiscussionNoteSchema, ResolveMergeRequestThreadSchema } from "./schemas.js";
 import { randomUUID } from "crypto";
 import { pino } from "pino";
 const logger = pino({
@@ -76,6 +77,71 @@ const server = new Server({
         tools: {},
     },
 });
+/**
+ * Validate configuration at startup
+ */
+function validateConfiguration() {
+    const errors = [];
+    // Validate SESSION_TIMEOUT_SECONDS
+    const timeoutStr = process.env.SESSION_TIMEOUT_SECONDS;
+    if (timeoutStr) {
+        const timeout = parseInt(timeoutStr);
+        // Allow values >=1 for testing purposes, but recommend 60-86400 for production
+        if (isNaN(timeout) || timeout < 1 || timeout > 86400) {
+            errors.push(`SESSION_TIMEOUT_SECONDS must be between 1 and 86400 seconds, got: ${timeoutStr}`);
+        }
+        if (timeout < 60) {
+            logger.warn(`SESSION_TIMEOUT_SECONDS=${timeout} is below recommended minimum of 60 seconds. Only use low values for testing.`);
+        }
+    }
+    // Validate MAX_SESSIONS
+    const maxSessionsStr = process.env.MAX_SESSIONS;
+    if (maxSessionsStr) {
+        const maxSessions = parseInt(maxSessionsStr);
+        if (isNaN(maxSessions) || maxSessions < 1 || maxSessions > 10000) {
+            errors.push(`MAX_SESSIONS must be between 1 and 10000, got: ${maxSessionsStr}`);
+        }
+    }
+    // Validate MAX_REQUESTS_PER_MINUTE
+    const maxReqStr = process.env.MAX_REQUESTS_PER_MINUTE;
+    if (maxReqStr) {
+        const maxReq = parseInt(maxReqStr);
+        if (isNaN(maxReq) || maxReq < 1 || maxReq > 1000) {
+            errors.push(`MAX_REQUESTS_PER_MINUTE must be between 1 and 1000, got: ${maxReqStr}`);
+        }
+    }
+    // Validate PORT
+    const portStr = process.env.PORT;
+    if (portStr) {
+        const port = parseInt(portStr);
+        if (isNaN(port) || port < 1 || port > 65535) {
+            errors.push(`PORT must be between 1 and 65535, got: ${portStr}`);
+        }
+    }
+    // Validate GITLAB_API_URL format
+    const apiUrl = process.env.GITLAB_API_URL;
+    if (apiUrl) {
+        try {
+            new URL(apiUrl);
+        }
+        catch (error) {
+            errors.push(`GITLAB_API_URL must be a valid URL, got: ${apiUrl}`);
+        }
+    }
+    // Validate auth configuration
+    const remoteAuth = process.env.REMOTE_AUTHORIZATION === "true";
+    const hasToken = !!process.env.GITLAB_PERSONAL_ACCESS_TOKEN;
+    const hasCookie = !!process.env.GITLAB_AUTH_COOKIE_PATH;
+    if (!remoteAuth && !hasToken && !hasCookie) {
+        errors.push('Either GITLAB_PERSONAL_ACCESS_TOKEN, GITLAB_AUTH_COOKIE_PATH, or REMOTE_AUTHORIZATION=true must be set');
+    }
+    if (errors.length > 0) {
+        logger.error('Configuration validation failed:');
+        errors.forEach(err => logger.error(`  - ${err}`));
+        process.exit(1);
+    }
+    logger.info('Configuration validation passed');
+}
 const GITLAB_PERSONAL_ACCESS_TOKEN = process.env.GITLAB_PERSONAL_ACCESS_TOKEN;
 const GITLAB_AUTH_COOKIE_PATH = process.env.GITLAB_AUTH_COOKIE_PATH;
 const IS_OLD = process.env.GITLAB_IS_OLD === "true";
@@ -86,6 +152,8 @@ const USE_MILESTONE = process.env.USE_MILESTONE === "true";
 const USE_PIPELINE = process.env.USE_PIPELINE === "true";
 const SSE = process.env.SSE === "true";
 const STREAMABLE_HTTP = process.env.STREAMABLE_HTTP === "true";
+const REMOTE_AUTHORIZATION = process.env.REMOTE_AUTHORIZATION === "true";
+const SESSION_TIMEOUT_SECONDS = process.env.SESSION_TIMEOUT_SECONDS ? parseInt(process.env.SESSION_TIMEOUT_SECONDS) : 3600;
 const HOST = process.env.HOST || "0.0.0.0";
 const PORT = process.env.PORT || 3002;
 // Add proxy configuration
@@ -192,20 +260,41 @@ async function ensureSessionForRequest() {
         }
     }
 }
-// Modify DEFAULT_HEADERS to include agent configuration
-const DEFAULT_HEADERS = {
+const sessionAuthStore = new AsyncLocalStorage();
+// Base headers without authentication
+const BASE_HEADERS = {
     Accept: "application/json",
     "Content-Type": "application/json",
 };
-if (IS_OLD) {
-    DEFAULT_HEADERS["Private-Token"] = `${GITLAB_PERSONAL_ACCESS_TOKEN}`;
-}
-else {
-    DEFAULT_HEADERS["Authorization"] = `Bearer ${GITLAB_PERSONAL_ACCESS_TOKEN}`;
+/**
+ * Build authentication headers dynamically based on context
+ * In REMOTE_AUTHORIZATION mode, reads from AsyncLocalStorage session context
+ * Otherwise, uses environment token
+ */
+function buildAuthHeaders() {
+    if (REMOTE_AUTHORIZATION) {
+        const ctx = sessionAuthStore.getStore();
+        if (ctx && ctx.token) {
+            return {
+                [ctx.header]: ctx.header === 'Authorization' ? `Bearer ${ctx.token}` : ctx.token
+            };
+        }
+        return {}; // No auth headers if no session context
+    }
+    // Standard mode: use environment token
+    if (IS_OLD && GITLAB_PERSONAL_ACCESS_TOKEN) {
+        return { 'Private-Token': String(GITLAB_PERSONAL_ACCESS_TOKEN) };
+    }
+    if (GITLAB_PERSONAL_ACCESS_TOKEN) {
+        return { Authorization: `Bearer ${GITLAB_PERSONAL_ACCESS_TOKEN}` };
+    }
+    return {};
 }
 // Create a default fetch configuration object that includes proxy agents if set
 const DEFAULT_FETCH_CONFIG = {
-    headers: DEFAULT_HEADERS,
+    get headers() {
+        return { ...BASE_HEADERS, ...buildAuthHeaders() };
+    },
     agent: (parsedUrl) => {
         if (parsedUrl.protocol === "https:") {
             return httpsAgent;
@@ -306,21 +395,56 @@ const allTools = [
         description: "Create a new thread on a merge request",
         inputSchema: toJSONSchema(CreateMergeRequestThreadSchema),
     },
+    {
+        name: 'resolve_merge_request_thread',
+        description: "Resolve a thread on a merge request",
+        inputSchema: toJSONSchema(ResolveMergeRequestThreadSchema),
+    },
     {
         name: "mr_discussions",
         description: "List discussion items for a merge request",
         inputSchema: toJSONSchema(ListMergeRequestDiscussionsSchema),
     },
     {
-        name: "update_merge_request_note",
-        description: "Modify an existing merge request thread note",
-        inputSchema: toJSONSchema(UpdateMergeRequestNoteSchema),
+        name: "delete_merge_request_discussion_note",
+        description: "Delete a discussion note on a merge request",
+        inputSchema: toJSONSchema(DeleteMergeRequestDiscussionNoteSchema),
+    },
+    {
+        name: "update_merge_request_discussion_note",
+        description: "Update a discussion note on a merge request",
+        inputSchema: toJSONSchema(UpdateMergeRequestDiscussionNoteSchema),
+    },
+    {
+        name: "create_merge_request_discussion_note",
+        description: "Add a new discussion note to an existing merge request thread",
+        inputSchema: toJSONSchema(CreateMergeRequestDiscussionNoteSchema),
     },
     {
         name: "create_merge_request_note",
-        description: "Add a new note to an existing merge request thread",
+        description: "Add a new note to a merge request",
         inputSchema: toJSONSchema(CreateMergeRequestNoteSchema),
     },
+    {
+        name: "delete_merge_request_note",
+        description: "Delete an existing merge request note",
+        inputSchema: toJSONSchema(DeleteMergeRequestNoteSchema),
+    },
+    {
+        name: "get_merge_request_note",
+        description: "Get a specific note for a merge request",
+        inputSchema: toJSONSchema(GetMergeRequestNoteSchema),
+    },
+    {
+        name: 'get_merge_request_notes',
+        description: "List notes for a merge request",
+        inputSchema: toJSONSchema(GetMergeRequestNotesSchema),
+    },
+    {
+        name: "update_merge_request_note",
+        description: "Modify an existing merge request note",
+        inputSchema: toJSONSchema(UpdateMergeRequestNoteSchema),
+    },
     {
         name: "get_draft_note",
         description: "Get a single draft note from a merge request",
@@ -661,6 +785,41 @@ const allTools = [
         description: "List all visible events for a specified project. Note: before/after parameters accept date format YYYY-MM-DD only",
         inputSchema: toJSONSchema(GetProjectEventsSchema),
     },
+    {
+        name: "list_releases",
+        description: "List all releases for a project",
+        inputSchema: toJSONSchema(ListReleasesSchema),
+    },
+    {
+        name: "get_release",
+        description: "Get a release by tag name",
+        inputSchema: toJSONSchema(GetReleaseSchema),
+    },
+    {
+        name: "create_release",
+        description: "Create a new release in a GitLab project",
+        inputSchema: toJSONSchema(CreateReleaseSchema),
+    },
+    {
+        name: "update_release",
+        description: "Update an existing release in a GitLab project",
+        inputSchema: toJSONSchema(UpdateReleaseSchema),
+    },
+    {
+        name: "delete_release",
+        description: "Delete a release from a GitLab project (does not delete the associated tag)",
+        inputSchema: toJSONSchema(DeleteReleaseSchema),
+    },
+    {
+        name: "create_release_evidence",
+        description: "Create release evidence for an existing release (GitLab Premium/Ultimate only)",
+        inputSchema: toJSONSchema(CreateReleaseEvidenceSchema),
+    },
+    {
+        name: "download_release_asset",
+        description: "Download a release asset file by direct asset path",
+        inputSchema: toJSONSchema(DownloadReleaseAssetSchema),
+    },
 ];
 // Define which tools are read-only
 const readOnlyTools = [
@@ -710,6 +869,9 @@ const readOnlyTools = [
     "download_attachment",
     "list_events",
     "get_project_events",
+    "list_releases",
+    "get_release",
+    "download_release_asset",
 ];
 // Define which tools are related to wiki and can be toggled by USE_GITLAB_WIKI
 const wikiToolNames = [
@@ -771,9 +933,27 @@ const GITLAB_API_URL = normalizeGitLabApiUrl(process.env.GITLAB_API_URL || "");
 const GITLAB_PROJECT_ID = process.env.GITLAB_PROJECT_ID;
 const GITLAB_ALLOWED_PROJECT_IDS = process.env.GITLAB_ALLOWED_PROJECT_IDS?.split(',').map(id => id.trim()).filter(Boolean) || [];
 const GITLAB_COMMIT_FILES_PER_PAGE = process.env.GITLAB_COMMIT_FILES_PER_PAGE ? parseInt(process.env.GITLAB_COMMIT_FILES_PER_PAGE) : 20;
-if (!GITLAB_PERSONAL_ACCESS_TOKEN) {
-    logger.error("GITLAB_PERSONAL_ACCESS_TOKEN environment variable is not set");
-    process.exit(1);
+// Validate authentication configuration
+if (REMOTE_AUTHORIZATION) {
+    // Remote authorization mode: token comes from HTTP headers
+    if (SSE) {
+        logger.error("REMOTE_AUTHORIZATION=true is not compatible with SSE transport mode");
+        logger.error("Please use STREAMABLE_HTTP=true instead");
+        process.exit(1);
+    }
+    if (!STREAMABLE_HTTP) {
+        logger.error("REMOTE_AUTHORIZATION=true requires STREAMABLE_HTTP=true");
+        logger.error("Set STREAMABLE_HTTP=true to enable remote authorization");
+        process.exit(1);
+    }
+    logger.info("Remote authorization enabled: tokens will be read from HTTP headers");
+}
+else {
+    // Standard mode: token must be in environment
+    if (!GITLAB_PERSONAL_ACCESS_TOKEN) {
+        logger.error("GITLAB_PERSONAL_ACCESS_TOKEN environment variable is not set");
+        process.exit(1);
+    }
 }
 /**
  * Utility function for handling GitLab API errors
@@ -1284,6 +1464,18 @@ async function listMergeRequestDiscussions(projectId, mergeRequestIid, options =
 async function listIssueDiscussions(projectId, issueIid, options = {}) {
     return listDiscussions(projectId, "issues", issueIid, options);
 }
+async function deleteMergeRequestDiscussionNote(projectId, mergeRequestIid, discussionId, noteId) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/discussions/${discussionId}/notes/${noteId}`);
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "DELETE",
+    });
+    if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`GitLab API error: ${response.status} ${response.statusText}\n${errorText}`);
+    }
+}
 /**
  * Modify an existing merge request thread note
  * 병합 요청 토론 노트 수정
@@ -1296,7 +1488,7 @@ async function listIssueDiscussions(projectId, issueIid, options = {}) {
  * @param {boolean} [resolved] - Resolve/unresolve state
  * @returns {Promise<GitLabDiscussionNote>} The updated note
  */
-async function updateMergeRequestNote(projectId, mergeRequestIid, discussionId, noteId, body, resolved) {
+async function updateMergeRequestDiscussionNote(projectId, mergeRequestIid, discussionId, noteId, body, resolved) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/discussions/${discussionId}/notes/${noteId}`);
     // Only one of body or resolved can be sent according to GitLab API
@@ -1364,7 +1556,7 @@ async function createIssueNote(projectId, issueIid, discussionId, body, createdA
     return GitLabDiscussionNoteSchema.parse(data);
 }
 /**
- * Add a new note to an existing merge request thread
+ * Add a new discussion note to an existing merge request thread
  * 기존 병합 요청 스레드에 새 노트 추가
  *
  * @param {string} projectId - The ID or URL-encoded path of the project
@@ -1374,7 +1566,7 @@ async function createIssueNote(projectId, issueIid, discussionId, body, createdA
  * @param {string} [createdAt] - The creation date of the note (ISO 8601 format)
  * @returns {Promise<GitLabDiscussionNote>} The created note
  */
-async function createMergeRequestNote(projectId, mergeRequestIid, discussionId, body, createdAt) {
+async function createMergeRequestDiscussionNote(projectId, mergeRequestIid, discussionId, body, createdAt) {
     projectId = decodeURIComponent(projectId); // Decode project ID
     const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/discussions/${discussionId}/notes`);
     const payload = { body };
@@ -1390,6 +1582,81 @@ async function createMergeRequestNote(projectId, mergeRequestIid, discussionId,
     const data = await response.json();
     return GitLabDiscussionNoteSchema.parse(data);
 }
+async function createMergeRequestNote(projectId, mergeRequestIid, body) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/notes`);
+    const payload = {
+        id: projectId,
+        merge_request_iid: mergeRequestIid,
+        body,
+    };
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "POST",
+        body: JSON.stringify(payload),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabDiscussionNoteSchema.parse(data);
+}
+async function deleteMergeRequestNote(projectId, mergeRequestIid, noteId) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/notes/${noteId}`);
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "DELETE",
+    });
+    if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`GitLab API error: ${response.status} ${response.statusText}\n${errorText}`);
+    }
+}
+async function getMergeRequestNote(projectId, mergeRequestIid, noteId) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/notes/${noteId}`);
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "GET",
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabDiscussionNoteSchema.parse(data);
+}
+async function getMergeRequestNotes(projectId, mergeRequestIid, sort, order_by) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/notes`);
+    if (sort) {
+        url.searchParams.append("sort", sort);
+    }
+    if (order_by) {
+        url.searchParams.append("order_by", order_by);
+    }
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "GET",
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return z.array(GitLabDiscussionNoteSchema).parse(data);
+}
+async function updateMergeRequestNote(projectId, mergeRequestIid, noteId, body) {
+    projectId = decodeURIComponent(projectId); // Decode project ID
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/notes/${noteId}`);
+    const payload = {
+        id: projectId,
+        merge_request_iid: mergeRequestIid,
+        note_id: noteId,
+        body,
+    };
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "PUT",
+        body: JSON.stringify(payload),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabDiscussionNoteSchema.parse(data);
+}
 /**
  * Create or update a file in a GitLab project
  * 파일 생성 또는 업데이트
@@ -2000,6 +2267,21 @@ async function bulkPublishDraftNotes(projectId, mergeRequestIid) {
         return [];
     }
 }
+async function resolveMergeRequestThread(projectId, mergeRequestIid, discussionId, resolved) {
+    projectId = decodeURIComponent(projectId);
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${mergeRequestIid}/discussions/${discussionId}`);
+    if (resolved !== undefined) {
+        url.searchParams.append("resolved", resolved ? "true" : "false");
+    }
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "PUT",
+    });
+    if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`GitLab API error: ${response.status} ${response.statusText}\n${errorText}`);
+    }
+}
 /**
  * Create a new thread on a merge request
  * 📦 새로운 함수: createMergeRequestThread - 병합 요청에 새로운 스레드(토론)를 생성하는 함수
@@ -2539,7 +2821,8 @@ async function getPipelineJobOutput(projectId, jobId, limit, offset) {
     const response = await fetch(url.toString(), {
         ...DEFAULT_FETCH_CONFIG,
         headers: {
-            ...DEFAULT_HEADERS,
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
             Accept: "text/plain", // Override Accept header to get plain text
         },
     });
@@ -2587,7 +2870,10 @@ async function createPipeline(projectId, ref, variables) {
     }
     const response = await fetch(url.toString(), {
         method: "POST",
-        headers: DEFAULT_HEADERS,
+        headers: {
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
+        },
         body: JSON.stringify(body),
     });
     await handleGitLabError(response);
@@ -2606,7 +2892,10 @@ async function retryPipeline(projectId, pipelineId) {
     const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipelines/${pipelineId}/retry`);
     const response = await fetch(url.toString(), {
         method: "POST",
-        headers: DEFAULT_HEADERS,
+        headers: {
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
+        },
     });
     await handleGitLabError(response);
     const data = await response.json();
@@ -2624,7 +2913,10 @@ async function cancelPipeline(projectId, pipelineId) {
     const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/pipelines/${pipelineId}/cancel`);
     const response = await fetch(url.toString(), {
         method: "POST",
-        headers: DEFAULT_HEADERS,
+        headers: {
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
+        },
     });
     await handleGitLabError(response);
     const data = await response.json();
@@ -2716,14 +3008,9 @@ async function getRepositoryTree(options) {
     if (options.pagination)
         queryParams.append("pagination", options.pagination);
     const headers = {
-        "Content-Type": "application/json",
+        ...BASE_HEADERS,
+        ...buildAuthHeaders(),
     };
-    if (IS_OLD) {
-        headers["Private-Token"] = `${GITLAB_PERSONAL_ACCESS_TOKEN}`;
-    }
-    else {
-        headers["Authorization"] = `Bearer ${GITLAB_PERSONAL_ACCESS_TOKEN}`;
-    }
     const response = await fetch(`${GITLAB_API_URL}/projects/${encodeURIComponent(getEffectiveProjectId(options.project_id))}/repository/tree?${queryParams.toString()}`, {
         headers,
     });
@@ -3189,7 +3476,8 @@ async function markdownUpload(projectId, filePath) {
     const response = await fetch(url.toString(), {
         method: "POST",
         headers: {
-            ...DEFAULT_HEADERS,
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
             // Remove Content-Type header to let form-data set it with boundary
             "Content-Type": undefined,
         },
@@ -3206,7 +3494,10 @@ async function downloadAttachment(projectId, secret, filename, localPath) {
     const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/uploads/${secret}/${filename}`);
     const response = await fetch(url.toString(), {
         method: "GET",
-        headers: DEFAULT_HEADERS,
+        headers: {
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
+        },
     });
     if (!response.ok) {
         await handleGitLabError(response);
@@ -3234,7 +3525,10 @@ async function listEvents(options = {}) {
     });
     const response = await fetch(url.toString(), {
         method: "GET",
-        headers: DEFAULT_HEADERS,
+        headers: {
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
+        },
     });
     if (!response.ok) {
         await handleGitLabError(response);
@@ -3259,7 +3553,10 @@ async function getProjectEvents(projectId, options = {}) {
     });
     const response = await fetch(url.toString(), {
         method: "GET",
-        headers: DEFAULT_HEADERS,
+        headers: {
+            ...BASE_HEADERS,
+            ...buildAuthHeaders(),
+        },
     });
     if (!response.ok) {
         await handleGitLabError(response);
@@ -3267,6 +3564,134 @@ async function getProjectEvents(projectId, options = {}) {
     const data = await response.json();
     return GitLabEventSchema.array().parse(data);
 }
+/**
+ * List all releases for a project
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param options Optional parameters for listing releases
+ * @returns Array of GitLab releases
+ */
+async function listReleases(projectId, options = {}) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases`);
+    // Add query parameters
+    Object.entries(options).forEach(([key, value]) => {
+        if (value !== undefined) {
+            url.searchParams.append(key, value.toString());
+        }
+    });
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabReleaseSchema.array().parse(data);
+}
+/**
+ * Get a release by tag name
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param tagName The Git tag the release is associated with
+ * @param includeHtmlDescription If true, includes HTML rendered Markdown
+ * @returns GitLab release
+ */
+async function getRelease(projectId, tagName, includeHtmlDescription) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const url = new URL(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases/${encodeURIComponent(tagName)}`);
+    if (includeHtmlDescription !== undefined) {
+        url.searchParams.append("include_html_description", includeHtmlDescription.toString());
+    }
+    const response = await fetch(url.toString(), {
+        ...DEFAULT_FETCH_CONFIG,
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabReleaseSchema.parse(data);
+}
+/**
+ * Create a new release
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param options Options for creating the release
+ * @returns Created GitLab release
+ */
+async function createRelease(projectId, options) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const response = await fetch(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases`, {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "POST",
+        body: JSON.stringify(options),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabReleaseSchema.parse(data);
+}
+/**
+ * Update an existing release
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param tagName The Git tag the release is associated with
+ * @param options Options for updating the release
+ * @returns Updated GitLab release
+ */
+async function updateRelease(projectId, tagName, options) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const response = await fetch(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases/${encodeURIComponent(tagName)}`, {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "PUT",
+        body: JSON.stringify(options),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabReleaseSchema.parse(data);
+}
+/**
+ * Delete a release
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param tagName The Git tag the release is associated with
+ * @returns Deleted GitLab release
+ */
+async function deleteRelease(projectId, tagName) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const response = await fetch(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases/${encodeURIComponent(tagName)}`, {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "DELETE",
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabReleaseSchema.parse(data);
+}
+/**
+ * Create release evidence (GitLab Premium/Ultimate only)
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param tagName The Git tag the release is associated with
+ */
+async function createReleaseEvidence(projectId, tagName) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const response = await fetch(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases/${encodeURIComponent(tagName)}/evidence`, {
+        ...DEFAULT_FETCH_CONFIG,
+        method: "POST",
+    });
+    await handleGitLabError(response);
+}
+/**
+ * Download a release asset
+ *
+ * @param projectId The ID or URL-encoded path of the project
+ * @param tagName The Git tag the release is associated with
+ * @param directAssetPath Path to the release asset file
+ * @returns The asset file content
+ */
+async function downloadReleaseAsset(projectId, tagName, directAssetPath) {
+    const effectiveProjectId = getEffectiveProjectId(projectId);
+    const response = await fetch(`${GITLAB_API_URL}/projects/${encodeURIComponent(effectiveProjectId)}/releases/${encodeURIComponent(tagName)}/downloads/${directAssetPath}`, {
+        ...DEFAULT_FETCH_CONFIG,
+    });
+    await handleGitLabError(response);
+    return await response.text();
+}
 server.setRequestHandler(ListToolsRequestSchema, async () => {
     // Apply read-only filter first
     const tools0 = GITLAB_READ_ONLY_MODE
@@ -3332,9 +3757,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         ...DEFAULT_FETCH_CONFIG,
                         method: "POST",
                         headers: {
-                            ...DEFAULT_HEADERS,
-                            "Content-Type": "application/json",
-                            Accept: "application/json",
+                            ...BASE_HEADERS,
+                            ...buildAuthHeaders(),
                         },
                         body: JSON.stringify({ query: args.query, variables: args.variables || {} }),
                         signal: controller.signal,
@@ -3475,18 +3899,61 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     content: [{ type: "text", text: JSON.stringify(mergeRequest, null, 2) }],
                 };
             }
-            case "update_merge_request_note": {
-                const args = UpdateMergeRequestNoteSchema.parse(request.params.arguments);
-                const note = await updateMergeRequestNote(args.project_id, args.merge_request_iid, args.discussion_id, args.note_id, args.body, // Now optional
+            case "delete_merge_request_discussion_note": {
+                const args = DeleteMergeRequestDiscussionNoteSchema.parse(request.params.arguments);
+                const { project_id, merge_request_iid, discussion_id, note_id } = args;
+                await deleteMergeRequestDiscussionNote(project_id, merge_request_iid, discussion_id, note_id);
+                return {
+                    content: [{ type: "text", text: "Merge request discussion note deleted successfully" }],
+                };
+            }
+            case "update_merge_request_discussion_note": {
+                const args = UpdateMergeRequestDiscussionNoteSchema.parse(request.params.arguments);
+                const note = await updateMergeRequestDiscussionNote(args.project_id, args.merge_request_iid, args.discussion_id, args.note_id, args.body, // Now optional
                 args.resolved // Now one of body or resolved must be provided, not both
                 );
                 return {
                     content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
                 };
             }
+            case "create_merge_request_discussion_note": {
+                const args = CreateMergeRequestDiscussionNoteSchema.parse(request.params.arguments);
+                const note = await createMergeRequestDiscussionNote(args.project_id, args.merge_request_iid, args.discussion_id, args.body, args.created_at);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
+                };
+            }
             case "create_merge_request_note": {
                 const args = CreateMergeRequestNoteSchema.parse(request.params.arguments);
-                const note = await createMergeRequestNote(args.project_id, args.merge_request_iid, args.discussion_id, args.body, args.created_at);
+                const note = await createMergeRequestNote(args.project_id, args.merge_request_iid, args.body);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
+                };
+            }
+            case "delete_merge_request_note": {
+                const args = DeleteMergeRequestNoteSchema.parse(request.params.arguments);
+                await deleteMergeRequestNote(args.project_id, args.merge_request_iid, args.note_id);
+                return {
+                    content: [{ type: "text", text: "Merge request note deleted successfully" }],
+                };
+            }
+            case 'get_merge_request_note': {
+                const args = GetMergeRequestNoteSchema.parse(request.params.arguments);
+                const note = await getMergeRequestNote(args.project_id, args.merge_request_iid, args.note_id);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
+                };
+            }
+            case 'get_merge_request_notes': {
+                const args = GetMergeRequestNotesSchema.parse(request.params.arguments);
+                const notes = await getMergeRequestNotes(args.project_id, args.merge_request_iid, args.sort, args.order_by);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(notes, null, 2) }],
+                };
+            }
+            case 'update_merge_request_note': {
+                const args = UpdateMergeRequestNoteSchema.parse(request.params.arguments);
+                const note = await updateMergeRequestNote(args.project_id, args.merge_request_iid, args.note_id, args.body);
                 return {
                     content: [{ type: "text", text: JSON.stringify(note, null, 2) }],
                 };
@@ -3708,6 +4175,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     content: [{ type: "text", text: JSON.stringify(thread, null, 2) }],
                 };
             }
+            case "resolve_merge_request_thread": {
+                const args = ResolveMergeRequestThreadSchema.parse(request.params.arguments);
+                const { project_id, merge_request_iid, discussion_id, resolved } = args;
+                await resolveMergeRequestThread(project_id, merge_request_iid, discussion_id, resolved);
+                return {
+                    content: [{ type: "text", text: "Thread resolved successfully" }],
+                };
+            }
             case "list_issues": {
                 const args = ListIssuesSchema.parse(request.params.arguments);
                 const { project_id, ...options } = args;
@@ -4211,6 +4686,68 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     content: [{ type: "text", text: JSON.stringify(events, null, 2) }],
                 };
             }
+            case "list_releases": {
+                const args = ListReleasesSchema.parse(request.params.arguments);
+                const { project_id, ...options } = args;
+                const releases = await listReleases(project_id, options);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(releases, null, 2) }],
+                };
+            }
+            case "get_release": {
+                const args = GetReleaseSchema.parse(request.params.arguments);
+                const release = await getRelease(args.project_id, args.tag_name, args.include_html_description);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(release, null, 2) }],
+                };
+            }
+            case "create_release": {
+                const args = CreateReleaseSchema.parse(request.params.arguments);
+                const { project_id, ...options } = args;
+                const release = await createRelease(project_id, options);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(release, null, 2) }],
+                };
+            }
+            case "update_release": {
+                const args = UpdateReleaseSchema.parse(request.params.arguments);
+                const { project_id, tag_name, ...options } = args;
+                const release = await updateRelease(project_id, tag_name, options);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(release, null, 2) }],
+                };
+            }
+            case "delete_release": {
+                const args = DeleteReleaseSchema.parse(request.params.arguments);
+                const release = await deleteRelease(args.project_id, args.tag_name);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: JSON.stringify({ status: "success", message: "Release deleted successfully", release }, null, 2),
+                        },
+                    ],
+                };
+            }
+            case "create_release_evidence": {
+                const args = CreateReleaseEvidenceSchema.parse(request.params.arguments);
+                await createReleaseEvidence(args.project_id, args.tag_name);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: JSON.stringify({ status: "success", message: "Release evidence created successfully" }, null, 2),
+                        },
+                    ],
+                };
+            }
+            case "download_release_asset": {
+                const args = DownloadReleaseAssetSchema.parse(request.params.arguments);
+                const assetContent = await downloadReleaseAsset(args.project_id, args.tag_name, args.direct_asset_path);
+                return {
+                    content: [{ type: "text", text: assetContent }],
+                };
+            }
             default:
                 throw new Error(`Unknown tool: ${request.params.name}`);
         }
@@ -4301,48 +4838,264 @@ async function startSSEServer() {
 async function startStreamableHTTPServer() {
     const app = express();
     const streamableTransports = {};
+    // Session-based auth mapping for remote authorization
+    const authBySession = {};
+    const authTimeouts = {};
+    // Configuration and limits
+    const MAX_SESSIONS = parseInt(process.env.MAX_SESSIONS || '1000');
+    const MAX_REQUESTS_PER_MINUTE = parseInt(process.env.MAX_REQUESTS_PER_MINUTE || '60');
+    // Metrics tracking
+    const metrics = {
+        activeSessions: 0,
+        totalSessions: 0,
+        expiredSessions: 0,
+        authFailures: 0,
+        requestsProcessed: 0,
+        rejectedByRateLimit: 0,
+        rejectedByCapacity: 0,
+    };
+    // Rate limiting per session
+    const sessionRequestCounts = {};
+    /**
+     * Validate token format and length
+     */
+    const validateToken = (token) => {
+        // GitLab PAT format: glpat-xxxxx (min 20 chars)
+        if (token.length < 20)
+            return false;
+        if (!/^[a-zA-Z0-9_\.-]+$/.test(token))
+            return false;
+        return true;
+    };
+    /**
+     * Check rate limit for session
+     */
+    const checkRateLimit = (sessionId) => {
+        const now = Date.now();
+        const session = sessionRequestCounts[sessionId];
+        if (!session || now > session.resetAt) {
+            sessionRequestCounts[sessionId] = { count: 1, resetAt: now + 60000 };
+            return true;
+        }
+        if (session.count >= MAX_REQUESTS_PER_MINUTE) {
+            return false;
+        }
+        session.count++;
+        return true;
+    };
+    /**
+     * Parse authentication from request headers
+     * Returns null if no auth found or invalid format
+     */
+    const parseAuthHeaders = (req) => {
+        const authHeader = req.headers['authorization'] || '';
+        const privateToken = req.headers['private-token'] || '';
+        if (privateToken) {
+            const token = privateToken.trim();
+            if (!token || !validateToken(token))
+                return null;
+            return { header: 'Private-Token', token, lastUsed: Date.now() };
+        }
+        if (authHeader) {
+            const match = authHeader.match(/^Bearer\s+(.+)$/i);
+            const token = match ? match[1].trim() : '';
+            if (!token || !validateToken(token))
+                return null;
+            return { header: 'Authorization', token, lastUsed: Date.now() };
+        }
+        return null;
+    };
+    /**
+     * Set or reset timeout for session auth
+     * After SESSION_TIMEOUT_SECONDS of inactivity, the auth token is removed
+     * but the transport session remains active
+     */
+    const setAuthTimeout = (sessionId) => {
+        // Clear existing timeout if any
+        clearAuthTimeout(sessionId);
+        // Set new timeout
+        authTimeouts[sessionId] = setTimeout(() => {
+            if (authBySession[sessionId]) {
+                logger.info(`Session ${sessionId}: auth token expired after ${SESSION_TIMEOUT_SECONDS}s of inactivity`);
+                delete authBySession[sessionId];
+                delete authTimeouts[sessionId];
+                metrics.expiredSessions++;
+            }
+        }, SESSION_TIMEOUT_SECONDS * 1000);
+    };
+    /**
+     * Clear timeout for session auth
+     */
+    const clearAuthTimeout = (sessionId) => {
+        const timeout = authTimeouts[sessionId];
+        if (timeout) {
+            clearTimeout(timeout);
+            delete authTimeouts[sessionId];
+        }
+    };
+    /**
+     * Clean up session auth data
+     */
+    const cleanupSessionAuth = (sessionId) => {
+        delete authBySession[sessionId];
+        clearAuthTimeout(sessionId);
+    };
     // Configure Express middleware
     app.use(express.json());
     // Streamable HTTP endpoint - handles both session creation and message handling
     app.post("/mcp", async (req, res) => {
         const sessionId = req.headers["mcp-session-id"];
-        try {
-            let transport;
-            if (sessionId && streamableTransports[sessionId]) {
-                // Reuse existing transport for ongoing session
-                transport = streamableTransports[sessionId];
-                await transport.handleRequest(req, res, req.body);
+        // Track request
+        metrics.requestsProcessed++;
+        // Rate limiting check for existing sessions
+        if (REMOTE_AUTHORIZATION && sessionId && !checkRateLimit(sessionId)) {
+            metrics.rejectedByRateLimit++;
+            res.status(429).json({
+                error: 'Rate limit exceeded',
+                message: `Maximum ${MAX_REQUESTS_PER_MINUTE} requests per minute allowed`
+            });
+            return;
+        }
+        // Capacity check for new sessions
+        if (!sessionId && Object.keys(streamableTransports).length >= MAX_SESSIONS) {
+            metrics.rejectedByCapacity++;
+            res.status(503).json({
+                error: 'Server capacity reached',
+                message: `Maximum ${MAX_SESSIONS} concurrent sessions allowed. Please try again later.`
+            });
+            return;
+        }
+        // Handle remote authorization: extract and store auth headers per session
+        if (REMOTE_AUTHORIZATION) {
+            const authData = parseAuthHeaders(req);
+            if (sessionId && !authBySession[sessionId]) {
+                // New session: require auth headers
+                if (!authData) {
+                    metrics.authFailures++;
+                    res.status(401).json({
+                        error: 'Missing Authorization or Private-Token header',
+                        message: 'Remote authorization is enabled. Please provide Authorization or Private-Token header.'
+                    });
+                    return;
+                }
+                // Store auth for this session
+                authBySession[sessionId] = authData;
+                logger.info(`Session ${sessionId}: stored ${authData.header} header`);
+                setAuthTimeout(sessionId);
             }
-            else {
-                // Create new transport for new session
-                transport = new StreamableHTTPServerTransport({
-                    sessionIdGenerator: () => randomUUID(),
-                    onsessioninitialized: (newSessionId) => {
-                        streamableTransports[newSessionId] = transport;
-                        logger.warn(`Streamable HTTP session initialized: ${newSessionId}`);
-                    },
+            else if (sessionId && authData) {
+                // Existing session: allow auth rotation/update
+                authBySession[sessionId] = authData;
+                logger.debug(`Session ${sessionId}: updated ${authData.header} header`);
+                setAuthTimeout(sessionId);
+            }
+            else if (sessionId && authBySession[sessionId]) {
+                // Existing session with stored auth: update last used time and reset timeout
+                authBySession[sessionId].lastUsed = Date.now();
+                setAuthTimeout(sessionId);
+            }
+            else if (!sessionId && !authData) {
+                // First request without session - will fail in initialization
+            }
+        }
+        // Wrap request handling in AsyncLocalStorage context
+        const handleRequestWithAuth = async () => {
+            try {
+                let transport;
+                if (sessionId && streamableTransports[sessionId]) {
+                    // Reuse existing transport for ongoing session
+                    transport = streamableTransports[sessionId];
+                    await transport.handleRequest(req, res, req.body);
+                }
+                else {
+                    // Create new transport for new session
+                    transport = new StreamableHTTPServerTransport({
+                        sessionIdGenerator: () => randomUUID(),
+                        onsessioninitialized: (newSessionId) => {
+                            streamableTransports[newSessionId] = transport;
+                            metrics.totalSessions++;
+                            metrics.activeSessions++;
+                            logger.warn(`Streamable HTTP session initialized: ${newSessionId}`);
+                            // Store auth for newly created session in remote mode
+                            if (REMOTE_AUTHORIZATION && !authBySession[newSessionId]) {
+                                const authData = parseAuthHeaders(req);
+                                if (authData) {
+                                    authBySession[newSessionId] = authData;
+                                    logger.info(`Session ${newSessionId}: stored ${authData.header} header`);
+                                    setAuthTimeout(newSessionId);
+                                }
+                            }
+                        },
+                    });
+                    // Set up cleanup handler when transport closes
+                    transport.onclose = () => {
+                        const sid = transport.sessionId;
+                        if (sid && streamableTransports[sid]) {
+                            logger.warn(`Streamable HTTP transport closed for session ${sid}, cleaning up`);
+                            delete streamableTransports[sid];
+                            metrics.activeSessions--;
+                            if (REMOTE_AUTHORIZATION) {
+                                cleanupSessionAuth(sid);
+                                delete sessionRequestCounts[sid];
+                                logger.info(`Session ${sid}: cleaned up auth mapping`);
+                            }
+                        }
+                    };
+                    // Connect transport to MCP server before handling the request
+                    await server.connect(transport);
+                    await transport.handleRequest(req, res, req.body);
+                }
+            }
+            catch (error) {
+                logger.error("Streamable HTTP error:", error);
+                res.status(500).json({
+                    error: "Internal server error",
+                    message: error instanceof Error ? error.message : "Unknown error",
                 });
-                // Set up cleanup handler when transport closes
-                transport.onclose = () => {
-                    const sid = transport.sessionId;
-                    if (sid && streamableTransports[sid]) {
-                        logger.warn(`Streamable HTTP transport closed for session ${sid}, cleaning up`);
-                        delete streamableTransports[sid];
-                    }
-                };
-                // Connect transport to MCP server before handling the request
-                await server.connect(transport);
-                await transport.handleRequest(req, res, req.body);
             }
+        };
+        // Execute with auth context in remote mode
+        if (REMOTE_AUTHORIZATION && sessionId && authBySession[sessionId]) {
+            const authData = authBySession[sessionId];
+            const ctx = {
+                sessionId,
+                header: authData.header,
+                token: authData.token,
+                lastUsed: authData.lastUsed
+            };
+            await sessionAuthStore.run(ctx, handleRequestWithAuth);
         }
-        catch (error) {
-            logger.error("Streamable HTTP error:", error);
-            res.status(500).json({
-                error: "Internal server error",
-                message: error instanceof Error ? error.message : "Unknown error",
-            });
+        else {
+            // Standard execution (no remote auth or no session yet)
+            await handleRequestWithAuth();
         }
     });
+    // Metrics endpoint
+    app.get("/metrics", (_req, res) => {
+        res.json({
+            ...metrics,
+            activeSessions: Object.keys(streamableTransports).length,
+            authenticatedSessions: Object.keys(authBySession).length,
+            uptime: process.uptime(),
+            memoryUsage: process.memoryUsage(),
+            config: {
+                maxSessions: MAX_SESSIONS,
+                maxRequestsPerMinute: MAX_REQUESTS_PER_MINUTE,
+                sessionTimeoutSeconds: SESSION_TIMEOUT_SECONDS,
+                remoteAuthEnabled: REMOTE_AUTHORIZATION,
+            }
+        });
+    });
+    // Health check endpoint
+    app.get("/health", (_req, res) => {
+        const isHealthy = Object.keys(streamableTransports).length < MAX_SESSIONS;
+        res.status(isHealthy ? 200 : 503).json({
+            status: isHealthy ? 'healthy' : 'degraded',
+            activeSessions: Object.keys(streamableTransports).length,
+            maxSessions: MAX_SESSIONS,
+            uptime: process.uptime(),
+        });
+    });
     // to delete a mcp server session explicitly
     app.delete("/mcp", async (req, res) => {
         const sessionId = req.headers["mcp-session-id"];
@@ -4355,6 +5108,11 @@ async function startStreamableHTTPServer() {
             try {
                 await transport.close();
                 logger.info(`Explicitly closed session via DELETE request: ${sessionId}`);
+                if (REMOTE_AUTHORIZATION) {
+                    cleanupSessionAuth(sessionId);
+                    delete sessionRequestCounts[sessionId];
+                    logger.info(`Session ${sessionId}: cleaned up auth mapping on DELETE`);
+                }
                 res.status(204).send();
             }
             catch (error) {
@@ -4366,20 +5124,47 @@ async function startStreamableHTTPServer() {
             res.status(404).json({ error: "Session not found" });
         }
     });
-    // Health check endpoint
-    app.get("/health", (_, res) => {
-        res.status(200).json({
-            status: "healthy",
-            version: SERVER_VERSION,
-            transport: TransportMode.STREAMABLE_HTTP,
-            activeSessions: Object.keys(streamableTransports).length,
-        });
-    });
     // Start server
-    app.listen(Number(PORT), HOST, () => {
+    const httpServer = app.listen(Number(PORT), HOST, () => {
         logger.info(`GitLab MCP Server running with Streamable HTTP transport`);
         logger.info(`${colorGreen}Endpoint: http://${HOST}:${PORT}/mcp${colorReset}`);
     });
+    // Graceful shutdown handler
+    const gracefulShutdown = async (signal) => {
+        logger.info(`${signal} received, starting graceful shutdown...`);
+        // Stop accepting new connections
+        httpServer.close(() => {
+            logger.info('HTTP server closed');
+        });
+        // Close all active sessions
+        const sessionIds = Object.keys(streamableTransports);
+        logger.info(`Closing ${sessionIds.length} active sessions...`);
+        const closePromises = sessionIds.map(async (sessionId) => {
+            try {
+                const transport = streamableTransports[sessionId];
+                if (transport) {
+                    await transport.close();
+                    if (REMOTE_AUTHORIZATION) {
+                        cleanupSessionAuth(sessionId);
+                        delete sessionRequestCounts[sessionId];
+                    }
+                }
+            }
+            catch (error) {
+                logger.error(`Error closing session ${sessionId}:`, error);
+            }
+        });
+        await Promise.allSettled(closePromises);
+        // Clear all timeouts
+        Object.keys(authTimeouts).forEach(sessionId => {
+            clearAuthTimeout(sessionId);
+        });
+        logger.info('Graceful shutdown complete');
+        process.exit(0);
+    };
+    // Register signal handlers
+    process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
+    process.on('SIGINT', () => gracefulShutdown('SIGINT'));
 }
 /**
  * Initialize server with specific transport mode
@@ -4412,6 +5197,8 @@ async function initializeServerByTransportMode(mode) {
  */
 async function runServer() {
     try {
+        // Validate configuration before starting server
+        validateConfiguration();
         const transportMode = determineTransportMode();
         await initializeServerByTransportMode(transportMode);
     }