@zereight/mcp-gitlab 2.1.67 → 2.1.69

package/build/config.js

@@ -1,15 +1,30 @@
+import { BOOLEAN_CLI_FLAG_NAMES, nextBooleanFlagValue } from "./cli-boolean-flags.js";
 // Parse CLI arguments before anything else
 const args = process.argv.slice(2);
 export const cliArgs = {};
 for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg.startsWith("--")) {
-        const [key, value] = arg.slice(2).split("=");
-        if (value) {
-            cliArgs[key] = value;
+        const eqIndex = arg.indexOf("=");
+        if (eqIndex !== -1) {
+            const key = arg.slice(2, eqIndex);
+            const value = arg.slice(eqIndex + 1);
+            if (value) {
+                cliArgs[key] = value;
+            }
         }
-        else if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
-            cliArgs[key] = args[++i];
+        else {
+            const key = arg.slice(2);
+            if (BOOLEAN_CLI_FLAG_NAMES.has(key)) {
+                const parsed = nextBooleanFlagValue(args[i + 1]);
+                cliArgs[key] = parsed.value;
+                if (parsed.consumeNext) {
+                    i += 1;
+                }
+            }
+            else if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+                cliArgs[key] = args[++i];
+            }
         }
     }
 }
@@ -76,7 +91,9 @@ export const MCP_SERVER_URL = getConfig("mcp-server-url", "MCP_SERVER_URL");
 export const GITLAB_OAUTH_APP_ID = getConfig("oauth-app-id", "GITLAB_OAUTH_APP_ID");
 export const GITLAB_OAUTH_SCOPES_RAW = getConfig("oauth-scopes", "GITLAB_OAUTH_SCOPES");
 export const GITLAB_OAUTH_SCOPES = GITLAB_OAUTH_SCOPES_RAW
-    ? GITLAB_OAUTH_SCOPES_RAW.split(",").map((s) => s.trim()).filter(Boolean)
+    ? GITLAB_OAUTH_SCOPES_RAW.split(",")
+        .map(s => s.trim())
+        .filter(Boolean)
     : undefined;
 export const GITLAB_OAUTH_CALLBACK_PROXY = getConfig("oauth-callback-proxy", "GITLAB_OAUTH_CALLBACK_PROXY") === "true";
 /** @deprecated Use GITLAB_OAUTH_ALLOWED_GROUPS_RAW instead. Will be removed in the next major version. */
@@ -88,7 +105,10 @@ export const GITLAB_OAUTH_ALLOWED_GROUPS = (() => {
     const raw = newVar ?? oldVar;
     if (!raw)
         return undefined;
-    const groups = raw.split(",").map((g) => g.trim()).filter(Boolean);
+    const groups = raw
+        .split(",")
+        .map(g => g.trim())
+        .filter(Boolean);
     return groups.length > 0 ? groups : undefined;
 })();
 export const ENABLE_DYNAMIC_API_URL = getConfig("enable-dynamic-api-url", "ENABLE_DYNAMIC_API_URL") === "true";
@@ -163,6 +183,9 @@ export const HOST = getConfig("host", "HOST") || "127.0.0.1";
 /** Default HTTP port for the MCP server. */
 const _PORT_DEFAULT = 3002;
 export const PORT = _intEnv("PORT", "port", _PORT_DEFAULT);
+/** When true, oversized MCP tool replies are replaced with a preview plus a CLI replay command. */
+export const GITLAB_MCP_COMPACT_RESULTS = getConfig("compact-results", "GITLAB_MCP_COMPACT_RESULTS") === "true";
+export const GITLAB_MCP_COMPACT_RESULT_CHARS = _intEnv("GITLAB_MCP_COMPACT_RESULT_CHARS", "compact-result-chars", 4000);
 // ---------------------------------------------------------------------------
 // Proxy configuration
 // ---------------------------------------------------------------------------

package/build/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { getConfig, ENABLE_DYNAMIC_API_URL, ENABLE_DYNAMIC_PROJECT_SCOPE, ENABLE_STRICT_PROJECT_SCOPE, GITLAB_AUTH_COOKIE_PATH, GITLAB_ALLOW_UNAUTHENTICATED_TOOL_DISCOVERY, GITLAB_CA_CERT_PATH, GITLAB_JOB_TOKEN, GITLAB_MCP_OAUTH, GITLAB_OAUTH_APP_ID, GITLAB_OAUTH_SCOPES, GITLAB_OAUTH_CALLBACK_PROXY, GITLAB_PERSONAL_ACCESS_TOKEN, GITLAB_POOL_MAX_SIZE, GITLAB_DISABLE_VERSION_CHECK, GITLAB_READ_ONLY_MODE, GITLAB_MASKING_ENABLED, GITLAB_MASKING_CONFIG, GITLAB_MASKING_POLICY_FILE, GITLAB_MASKING_WORKSPACE_DIR, GITLAB_PERMISSION_MODE, GITLAB_TOOLSETS_RAW, GITLAB_TOOLS_RAW, HOST, HTTP_PROXY, HTTPS_PROXY, IS_OLD, MCP_SERVER_URL, NODE_TLS_REJECT_UNAUTHORIZED, NO_PROXY, OAUTH_STATELESS_CLIENT_TTL_SECONDS, OAUTH_STATELESS_MODE, OAUTH_STATELESS_PENDING_TTL_SECONDS, OAUTH_STATELESS_SESSION_TTL_SECONDS, OAUTH_STATELESS_STORED_TTL_SECONDS, PORT, REMOTE_AUTHORIZATION, SESSION_TIMEOUT_SECONDS, SSE, STREAMABLE_HTTP, MCP_TRUST_PROXY, USE_GITLAB_WIKI, USE_MILESTONE, USE_OAUTH, USE_PIPELINE, GITLAB_TOOL_POLICY_APPROVE_RAW, GITLAB_TOOL_POLICY_HIDDEN_RAW, GITLAB_OAUTH_ALLOWED_GROUPS_RAW, GITLAB_ALLOWED_GROUPS_RAW, GITLAB_OAUTH_ALLOWED_GROUPS, } from "./config.js";
+import { getConfig, ENABLE_DYNAMIC_API_URL, ENABLE_DYNAMIC_PROJECT_SCOPE, ENABLE_STRICT_PROJECT_SCOPE, GITLAB_AUTH_COOKIE_PATH, GITLAB_ALLOW_UNAUTHENTICATED_TOOL_DISCOVERY, GITLAB_CA_CERT_PATH, GITLAB_JOB_TOKEN, GITLAB_MCP_OAUTH, GITLAB_OAUTH_APP_ID, GITLAB_OAUTH_SCOPES, GITLAB_OAUTH_CALLBACK_PROXY, GITLAB_PERSONAL_ACCESS_TOKEN, GITLAB_POOL_MAX_SIZE, GITLAB_DISABLE_VERSION_CHECK, GITLAB_READ_ONLY_MODE, GITLAB_MASKING_ENABLED, GITLAB_MASKING_CONFIG, GITLAB_MASKING_POLICY_FILE, GITLAB_MASKING_WORKSPACE_DIR, GITLAB_PERMISSION_MODE, GITLAB_TOOLSETS_RAW, GITLAB_TOOLS_RAW, HOST, HTTP_PROXY, HTTPS_PROXY, IS_OLD, MCP_SERVER_URL, NODE_TLS_REJECT_UNAUTHORIZED, NO_PROXY, OAUTH_STATELESS_CLIENT_TTL_SECONDS, OAUTH_STATELESS_MODE, OAUTH_STATELESS_PENDING_TTL_SECONDS, OAUTH_STATELESS_SESSION_TTL_SECONDS, OAUTH_STATELESS_STORED_TTL_SECONDS, PORT, REMOTE_AUTHORIZATION, SESSION_TIMEOUT_SECONDS, SSE, STREAMABLE_HTTP, MCP_TRUST_PROXY, USE_GITLAB_WIKI, USE_MILESTONE, USE_OAUTH, USE_PIPELINE, GITLAB_TOOL_POLICY_APPROVE_RAW, GITLAB_TOOL_POLICY_HIDDEN_RAW, GITLAB_OAUTH_ALLOWED_GROUPS_RAW, GITLAB_ALLOWED_GROUPS_RAW, GITLAB_OAUTH_ALLOWED_GROUPS, GITLAB_MCP_COMPACT_RESULTS, GITLAB_MCP_COMPACT_RESULT_CHARS, } 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");
@@ -74,9 +74,13 @@ import path from "node:path";
 import { CookieJar, parse as parseCookie } from "tough-cookie";
 import { URL } from "node:url";
 import { z } from "zod";
-import { initializeOAuthClient } from "./oauth.js";
+import { createGitLabOAuthClient, ensureOAuthToken } from "./oauth.js";
 import { getPositionalCliCommand } from "./cli-command.js";
 import { runAuthCommandAsync } from "./auth-cli.js";
+import { isCliInvocation, resolveCli } from "./cli/router.js";
+import { formatCliError, formatToolOutput } from "./cli/output.js";
+import { compactMcpToolResult, readOwnRecord } from "./cli/compact-mcp-result.js";
+import { compileDeniedToolsRegex } from "./tools/denied-regex.js";
 import { createGitLabOAuthProvider } from "./oauth-proxy.js";
 import { mcpAuthRouter } from "@modelcontextprotocol/sdk/server/auth/router.js";
 import rateLimit, { ipKeyGenerator } from "express-rate-limit";
@@ -114,7 +118,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, OrbitQuerySchema, OrbitSchemaSchema, OrbitStatusSchema, OrbitToolsSchema, MarkAllTodosDoneSchema, MarkTodoDoneSchema, PaginatedDiscussionsResponseSchema, PromoteProjectMilestoneSchema, PublishDraftNoteSchema, PlayPipelineJobSchema, PushFilesSchema, RetryPipelineJobSchema, RetryPipelineSchema, SearchCodeSchema, SearchGroupCodeSchema, SearchProjectCodeSchema, SearchRepositoriesSchema, UpdateDraftNoteSchema, UpdateIssueNoteSchema, UpdateIssueSchema, UpdateIssueDescriptionPatchSchema, UpdateLabelSchema, UpdateProjectSchema, UpdateMergeRequestNoteSchema, UpdateMergeRequestDiscussionNoteSchema, UpdateMergeRequestSchema, UpdateWikiPageSchema, VerifyNamespaceSchema, GitLabEventSchema, ListEventsSchema, GetProjectEventsSchema, ExecuteGraphQLSchema, GitLabReleaseSchema, ListReleasesSchema, GetReleaseSchema, CreateReleaseSchema, UpdateReleaseSchema, DeleteReleaseSchema, CreateReleaseEvidenceSchema, DownloadReleaseAssetSchema, ListTagsSchema, GetTagSchema, CreateTagSchema, DeleteTagSchema, GetTagSignatureSchema, GitLabTagSchema, GitLabTagSignatureSchema, GetMergeRequestNotesSchema, GetMergeRequestNoteSchema, GetMergeRequestDiscussionSchema, DeleteMergeRequestDiscussionNoteSchema, ResolveMergeRequestThreadSchema, GetWorkItemSchema, ListWorkItemsSchema, CreateWorkItemSchema, UpdateWorkItemSchema, ConvertWorkItemTypeSchema, ListWorkItemStatusesSchema, ListWorkItemNotesSchema, CreateWorkItemNoteSchema, CreateWorkItemEmojiReactionSchema, CreateWorkItemNoteEmojiReactionSchema, ListWorkItemEmojiReactionsSchema, ListWorkItemNoteEmojiReactionsSchema, DeleteWorkItemEmojiReactionSchema, DeleteWorkItemNoteEmojiReactionSchema, MoveWorkItemSchema, ListCustomFieldDefinitionsSchema, GetTimelineEventsSchema, CreateTimelineEventSchema, ListWebhooksSchema, CreateWebhookSchema, UpdateWebhookSchema, DeleteWebhookSchema, ListWebhookEventsSchema, GetWebhookEventSchema, HealthCheckSchema, } from "./schemas.js";
+GetMergeRequestFileDiffSchema, ListMergeRequestChangedFilesSchema, ListMergeRequestDiscussionsSchema, ListMergeRequestPipelinesSchema, ListMergeRequestsSchema, ListGroupMergeRequestsSchema, ListMergeRequestVersionsSchema, GetMergeRequestVersionSchema, GitLabMergeRequestVersionSchema, GitLabMergeRequestVersionDetailSchema, ListNamespacesSchema, ListPipelineJobsSchema, ListPipelinesSchema, ListDeploymentsSchema, ListEnvironmentsSchema, ListPipelineTriggerJobsSchema, ValidateCiLintSchema, ValidateProjectCiLintSchema, ListCiCatalogResourcesSchema, GetCiCatalogResourceSchema, ListProjectMembersSchema, ListGroupMembersSchema, ListProjectMilestonesSchema, ListGroupMilestonesSchema, ListProjectsSchema, ListWikiPagesSchema, GetGroupWikiPageSchema, ListGroupWikiPagesSchema, UpdateGroupWikiPageSchema, MarkdownUploadSchema, MarkdownUploadRemoteSchema, DownloadAttachmentSchema, DownloadJobArtifactsSchema, GetJobArtifactFileSchema, GitLabArtifactEntrySchema, ListJobArtifactsSchema, MergeMergeRequestSchema, ApproveMergeRequestSchema, UnapproveMergeRequestSchema, GetMergeRequestApprovalStateSchema, GetMergeRequestConflictsSchema, GitLabMergeRequestApprovalsResponseSchema, GitLabMergeRequestApprovalStateSchema, MyIssuesSchema, OrbitQuerySchema, OrbitSchemaSchema, OrbitStatusSchema, OrbitToolsSchema, MarkAllTodosDoneSchema, MarkTodoDoneSchema, PaginatedDiscussionsResponseSchema, PromoteProjectMilestoneSchema, PublishDraftNoteSchema, PlayPipelineJobSchema, PushFilesSchema, RetryPipelineJobSchema, RetryPipelineSchema, SearchCodeSchema, SearchGroupCodeSchema, SearchProjectCodeSchema, SearchRepositoriesSchema, UpdateDraftNoteSchema, UpdateIssueNoteSchema, UpdateIssueSchema, UpdateIssueDescriptionPatchSchema, UpdateLabelSchema, UpdateProjectSchema, UpdateMergeRequestNoteSchema, UpdateMergeRequestDiscussionNoteSchema, UpdateMergeRequestSchema, UpdateWikiPageSchema, VerifyNamespaceSchema, GitLabEventSchema, ListEventsSchema, GetProjectEventsSchema, ExecuteGraphQLSchema, GitLabReleaseSchema, ListReleasesSchema, GetReleaseSchema, CreateReleaseSchema, UpdateReleaseSchema, DeleteReleaseSchema, CreateReleaseEvidenceSchema, DownloadReleaseAssetSchema, ListTagsSchema, GetTagSchema, CreateTagSchema, DeleteTagSchema, GetTagSignatureSchema, GitLabTagSchema, GitLabTagSignatureSchema, ListSnippetsSchema, GetSnippetSchema, CreateSnippetSchema, UpdateSnippetSchema, DeleteSnippetSchema, GitLabSnippetSchema, GetMergeRequestNotesSchema, GetMergeRequestNoteSchema, GetMergeRequestDiscussionSchema, DeleteMergeRequestDiscussionNoteSchema, ResolveMergeRequestThreadSchema, GetWorkItemSchema, ListWorkItemsSchema, CreateWorkItemSchema, UpdateWorkItemSchema, ConvertWorkItemTypeSchema, ListWorkItemStatusesSchema, ListWorkItemNotesSchema, CreateWorkItemNoteSchema, CreateWorkItemEmojiReactionSchema, CreateWorkItemNoteEmojiReactionSchema, ListWorkItemEmojiReactionsSchema, ListWorkItemNoteEmojiReactionsSchema, DeleteWorkItemEmojiReactionSchema, DeleteWorkItemNoteEmojiReactionSchema, MoveWorkItemSchema, ListCustomFieldDefinitionsSchema, GetTimelineEventsSchema, CreateTimelineEventSchema, ListWebhooksSchema, CreateWebhookSchema, UpdateWebhookSchema, DeleteWebhookSchema, ListWebhookEventsSchema, GetWebhookEventSchema, HealthCheckSchema, } from "./schemas.js";
 import { randomUUID, timingSafeEqual, } from "node:crypto";
 import { createLogger } from "./utils/logger.js";
 const logger = createLogger();
@@ -179,6 +183,7 @@ const MCP_PROMPTS = [
  * Each transport connection gets its own Server instance to prevent
  * cross-client data leakage (GHSA-345p-7cg4-v4c7).
  */
+/** Builds an MCP server with the tool list filtered by toolsets, permission mode, and policy. */
 function createServer() {
     // Precompute filtered tool list once at server creation (Steps 1–5 are static)
     // Step 1: Toolset filter — keep tools in enabled toolsets
@@ -329,11 +334,18 @@ function createServer() {
                     ? (value) => maskingEngine.maskValue(value)
                     : undefined,
             });
-            return maskingEngine
+            const masked = maskingEngine
                 ? maskingEngine.maskToolResult(filtered, {
                     textFormat: isPlainTextResult ? "plain" : "json",
                 })
                 : filtered;
+            return compactMcpToolResult({
+                result: masked,
+                enabled: GITLAB_MCP_COMPACT_RESULTS,
+                maxChars: GITLAB_MCP_COMPACT_RESULT_CHARS,
+                toolName,
+                args: readOwnRecord(request.params.arguments),
+            });
         };
         const logError = (error) => {
             const durationMs = Date.now() - start;
@@ -398,6 +410,16 @@ function createServer() {
             if (jmespathSyntaxError) {
                 return logCompletion({ content: [{ type: "text", text: jmespathSyntaxError }], isError: true }, { skipJmespath: true });
             }
+            // Enforce list-time filtering on direct calls: clients can call names that tools/list omits.
+            // filteredTools is extended by discover_tools; hidden-policy tools stay callable by design,
+            // but GITLAB_DENIED_TOOLS_REGEX always wins over the hidden exemption.
+            // Permission-mode denials fall through so handleToolCall reports its mode-specific error.
+            const hiddenAndNotDenied = hiddenToolSet.has(toolName) && !GITLAB_DENIED_TOOLS_REGEX?.test(toolName);
+            if (isToolAllowedByPermissionMode(toolName) &&
+                !hiddenAndNotDenied &&
+                !filteredTools.some(t => t.name === toolName)) {
+                throw new Error(`Tool "${toolName}" is not available on this server`);
+            }
             // Handle discover_tools meta-tool directly (needs access to mcpServer and filteredTools)
             if (toolName === "discover_tools") {
                 const category = request.params.arguments?.category?.trim()?.toLowerCase();
@@ -526,6 +548,7 @@ function createServer() {
         }
         catch (error) {
             logError(error);
+            throw error;
         }
     });
     return mcpServer;
@@ -846,15 +869,10 @@ export function hasStatelessSessionId(req) {
  * This avoids background timers that cause issues with multiple instances.
  */
 async function ensureValidOAuthToken() {
-    if (!oauthClient)
-        return;
-    if (oauthClient.hasValidToken())
-        return;
     try {
-        logger.info("OAuth token expired or missing, refreshing...");
-        const freshToken = await oauthClient.getAccessToken();
-        OAUTH_ACCESS_TOKEN = freshToken;
-        logger.info("OAuth token refreshed successfully");
+        await ensureOAuthToken(oauthClient, OAUTH_ACCESS_TOKEN, token => {
+            OAUTH_ACCESS_TOKEN = token;
+        });
     }
     catch (error) {
         logger.error({ err: error }, "Failed to refresh OAuth token");
@@ -873,33 +891,11 @@ function isToolAllowedByPermissionMode(toolName) {
     }
 }
 const GITLAB_DENIED_TOOLS_REGEX = (() => {
-    const pattern = getConfig("denied-tools-regex", "GITLAB_DENIED_TOOLS_REGEX");
-    if (!pattern)
-        return undefined;
-    // Reject patterns that are too long (potential ReDoS vector)
-    const MAX_PATTERN_LENGTH = 200;
-    if (pattern.length > MAX_PATTERN_LENGTH) {
-        logger.error(`GITLAB_DENIED_TOOLS_REGEX pattern exceeds ${MAX_PATTERN_LENGTH} chars. Ignoring.`);
-        return undefined;
-    }
-    // Reject patterns with nested quantifiers that can cause catastrophic backtracking (ReDoS)
-    // e.g., (a+)+, (a*)+, (a+)*, (a{1,})+
-    // Note: lookahead (?!), (?=), lookbehind (?<), and named groups (?<name>) are safe and allowed
-    const NESTED_QUANTIFIER_PATTERN = /(\(.*[+*?].*\)|\[.*\])[+*?]/;
-    if (NESTED_QUANTIFIER_PATTERN.test(pattern)) {
-        logger.error(`GITLAB_DENIED_TOOLS_REGEX contains potentially unsafe nested quantifiers. Ignoring.`);
-        return undefined;
-    }
-    try {
-        const regex = new RegExp(pattern);
-        // Dry-run against a sample string to catch immediate issues
-        regex.test("sample_tool_name");
-        return regex;
-    }
-    catch {
-        logger.error(`Invalid GITLAB_DENIED_TOOLS_REGEX pattern: "${pattern}". Ignoring.`);
-        return undefined;
+    const compiled = compileDeniedToolsRegex(getConfig("denied-tools-regex", "GITLAB_DENIED_TOOLS_REGEX"));
+    if (compiled.error) {
+        logger.error(compiled.error);
     }
+    return compiled.regex;
 })();
 // ---------------------------------------------------------------------------
 // Tool policy: approve / hidden sets
@@ -1317,7 +1313,7 @@ if (GITLAB_MCP_OAUTH) {
     }
     logger.info("MCP OAuth enabled: GitLab OAuth proxy active (Private-Token/JOB-TOKEN headers bypass OAuth)");
 }
-if (getPositionalCliCommand(process.argv) !== "auth" &&
+if (!isCliInvocation(process.argv) &&
     !REMOTE_AUTHORIZATION &&
     !GITLAB_MCP_OAUTH &&
     !USE_OAUTH &&
@@ -7605,6 +7601,163 @@ async function executeGitLabGraphQL(query, variables = {}) {
         clearTimeout(timeout);
     }
 }
+/**
+ * Build the snippets endpoint URL.
+ *
+ * When projectId is provided, or when a project allowlist is in effect (env
+ * GITLAB_PROJECT_ID / GITLAB_ALLOWED_PROJECT_IDS or a session scope narrowed via
+ * X-GitLab-Allowed-Project-Ids), returns the project snippets endpoint — routing
+ * through getEffectiveProjectId so the effective scope is enforced. Only falls
+ * back to the personal /snippets endpoint when no scope is active at all.
+ */
+function getSnippetsEndpoint(projectId) {
+    const scopeActive = getEffectiveAllowedProjectIds().length > 0 || !!GITLAB_PROJECT_ID;
+    if (projectId || scopeActive) {
+        const decoded = projectId ? decodeURIComponent(projectId) : "";
+        const effectiveProjectId = getEffectiveProjectId(decoded);
+        return `${getEffectiveApiUrl()}/projects/${encodeGitLabPathSegment(effectiveProjectId)}/snippets`;
+    }
+    return `${getEffectiveApiUrl()}/snippets`;
+}
+/**
+ * List snippets — project snippets if projectId is given, otherwise personal snippets.
+ */
+async function listSnippets(projectId, options = {}) {
+    const url = new URL(getSnippetsEndpoint(projectId));
+    Object.entries(options).forEach(([key, value]) => {
+        if (value !== undefined) {
+            url.searchParams.append(key, String(value));
+        }
+    });
+    const response = await fetch(url.toString(), {
+        ...getFetchConfig(),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabSnippetSchema.array().parse(data);
+}
+/**
+ * Get a snippet's metadata. Use getSnippetRawContent to fetch the raw file content.
+ */
+async function getSnippet(projectId, snippetId) {
+    const response = await fetch(`${getSnippetsEndpoint(projectId)}/${snippetId}`, {
+        ...getFetchConfig(),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabSnippetSchema.parse(data);
+}
+/**
+ * Get the raw content of a single-file snippet via the `/raw` endpoint.
+ * For multi-file snippets, use getSnippetFileRawContent instead.
+ */
+async function getSnippetRawContent(projectId, snippetId) {
+    const response = await fetch(`${getSnippetsEndpoint(projectId)}/${snippetId}/raw`, {
+        ...getFetchConfig(),
+    });
+    await handleGitLabError(response);
+    return await response.text();
+}
+/**
+ * Extract the ref (branch/tag/commit) from a snippet file's raw_url.
+ * Anchors on /snippets/{id}/raw/ so branch names or file paths containing
+ * the word "raw" don't produce a false match.
+ */
+function extractSnippetRef(rawUrl, snippetId, filePath) {
+    const rawMarker = `/snippets/${snippetId}/raw/`;
+    const decoded = decodeURIComponent(new URL(rawUrl).pathname);
+    const markerIdx = decoded.indexOf(rawMarker);
+    if (markerIdx === -1) {
+        throw new Error(`Cannot extract ref from snippet file raw_url: ${rawUrl}`);
+    }
+    const afterRaw = decoded.slice(markerIdx + rawMarker.length); // "{ref}/{filePath}"
+    const fileStart = afterRaw.lastIndexOf("/" + filePath);
+    if (fileStart === -1) {
+        throw new Error(`Cannot locate file path "${filePath}" in snippet file raw_url: ${rawUrl}`);
+    }
+    return afterRaw.slice(0, fileStart);
+}
+/**
+ * Fetch the raw content of one file inside a multi-file snippet.
+ * Accepts an explicit ref (branch/tag/commit) — callers resolve it via
+ * extractSnippetRef or a user-supplied parameter before calling this.
+ */
+async function getSnippetFileRawContent(projectId, snippetId, ref, filePath) {
+    const encodedRef = encodeGitLabPathSegment(ref);
+    const encodedPath = encodeGitLabPathSegment(filePath);
+    const url = `${getSnippetsEndpoint(projectId)}/${snippetId}/files/${encodedRef}/${encodedPath}/raw`;
+    const response = await fetch(url, { ...getFetchConfig() });
+    await handleGitLabError(response);
+    return await response.text();
+}
+function snippetCreateFilesPayload(options) {
+    if (options.files !== undefined && options.files.length > 0) {
+        return options.files;
+    }
+    if (options.file_name !== undefined && options.content !== undefined) {
+        return [{ file_path: options.file_name, content: options.content }];
+    }
+    throw new Error("Provide either files[] (multi-file) or both file_name and content (single-file)");
+}
+/**
+ * Create a snippet — project-scoped if projectId is given, otherwise personal.
+ */
+async function createSnippet(projectId, options) {
+    const { title, description, visibility } = options;
+    const body = {
+        title,
+        visibility: visibility ?? "private",
+        files: snippetCreateFilesPayload(options),
+    };
+    if (description !== undefined) {
+        body.description = description;
+    }
+    const response = await fetch(getSnippetsEndpoint(projectId), {
+        ...getFetchConfig(),
+        method: "POST",
+        body: JSON.stringify(body),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabSnippetSchema.parse(data);
+}
+/**
+ * Update an existing snippet — project-scoped if projectId is given, otherwise personal.
+ */
+async function updateSnippet(projectId, options) {
+    const { snippet_id, title, file_name, content, files, description, visibility } = options;
+    const body = {};
+    if (title !== undefined)
+        body.title = title;
+    if (description !== undefined)
+        body.description = description;
+    if (visibility !== undefined)
+        body.visibility = visibility;
+    if (files !== undefined) {
+        body.files = files;
+    }
+    else if (file_name !== undefined && content !== undefined) {
+        body.files = [{ action: "update", file_path: file_name, content }];
+    }
+    const response = await fetch(`${getSnippetsEndpoint(projectId)}/${snippet_id}`, {
+        ...getFetchConfig(),
+        method: "PUT",
+        body: JSON.stringify(body),
+    });
+    await handleGitLabError(response);
+    const data = await response.json();
+    return GitLabSnippetSchema.parse(data);
+}
+/**
+ * Delete a snippet — project-scoped if projectId is given, otherwise personal.
+ */
+async function deleteSnippet(projectId, snippetId) {
+    const response = await fetch(`${getSnippetsEndpoint(projectId)}/${snippetId}`, {
+        ...getFetchConfig(),
+        method: "DELETE",
+    });
+    await handleGitLabError(response);
+}
 // Request handlers are now registered inside createServer() factory function
 // to ensure each transport connection gets its own Server instance (GHSA-345p-7cg4-v4c7).
 async function handleToolCall(params) {
@@ -10129,6 +10282,82 @@ async function handleToolCall(params) {
                     content: [{ type: "text", text: JSON.stringify(signature) }],
                 };
             }
+            case "list_snippets": {
+                const args = ListSnippetsSchema.parse(params.arguments);
+                const { project_id, ...options } = args;
+                const snippets = await listSnippets(project_id, options);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(snippets, null, 2) }],
+                };
+            }
+            case "get_snippet": {
+                const args = GetSnippetSchema.parse(params.arguments);
+                const snippet = await getSnippet(args.project_id, args.snippet_id);
+                const result = { ...snippet };
+                if (args.include_content) {
+                    const files = snippet.files ?? [];
+                    if (files.length > 1) {
+                        const firstFile = files[0];
+                        let ref;
+                        if (args.ref !== undefined) {
+                            ref = args.ref;
+                        }
+                        else {
+                            if (!firstFile.raw_url)
+                                throw new Error(`Snippet file "${firstFile.path}" has no raw_url`);
+                            ref = extractSnippetRef(firstFile.raw_url, args.snippet_id, firstFile.path);
+                        }
+                        result.files = await Promise.all(files.map(async (f) => ({
+                            ...f,
+                            content: await getSnippetFileRawContent(args.project_id, args.snippet_id, ref, f.path),
+                        })));
+                    }
+                    else {
+                        const file = files[0];
+                        const filePath = file?.path ?? snippet.file_name ?? undefined;
+                        if (args.ref !== undefined && filePath) {
+                            result.content = await getSnippetFileRawContent(args.project_id, args.snippet_id, args.ref, filePath);
+                        }
+                        else {
+                            result.content = await getSnippetRawContent(args.project_id, args.snippet_id);
+                        }
+                    }
+                }
+                return {
+                    content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
+                };
+            }
+            case "create_snippet": {
+                const args = CreateSnippetSchema.parse(params.arguments);
+                const { project_id, ...options } = args;
+                const snippet = await createSnippet(project_id, options);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(snippet, null, 2) }],
+                };
+            }
+            case "update_snippet": {
+                const args = UpdateSnippetSchema.parse(params.arguments);
+                const { project_id, ...options } = args;
+                const snippet = await updateSnippet(project_id, options);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(snippet, null, 2) }],
+                };
+            }
+            case "delete_snippet": {
+                const args = DeleteSnippetSchema.parse(params.arguments);
+                await deleteSnippet(args.project_id, args.snippet_id);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: JSON.stringify({
+                                status: "success",
+                                message: `Snippet ${args.snippet_id} deleted successfully`,
+                            }, null, 2),
+                        },
+                    ],
+                };
+            }
             case "list_webhooks": {
                 const args = ListWebhooksSchema.parse(params.arguments);
                 const webhooks = await listWebhooks(args);
@@ -11771,10 +12000,12 @@ async function runServer() {
             logger.info("Using OAuth authentication...");
             try {
                 const gitlabBaseUrl = GITLAB_API_URL.replace(/\/api\/v4$/, "");
-                const oauthResult = await initializeOAuthClient(gitlabBaseUrl);
-                oauthClient = oauthResult.client;
-                OAUTH_ACCESS_TOKEN = oauthResult.accessToken;
-                logger.info("OAuth authentication successful");
+                // Construct the client synchronously (no network). The token is
+                // acquired lazily on the first tool call via ensureValidOAuthToken,
+                // by which point the network is ready. This avoids blocking startup
+                // and avoids opening a browser on transient boot-time network errors.
+                oauthClient = createGitLabOAuthClient(gitlabBaseUrl);
+                logger.info("OAuth enabled; token acquired lazily on first use.");
             }
             catch (error) {
                 logger.error({ err: error }, "OAuth authentication failed");
@@ -11816,7 +12047,16 @@ async function runServer() {
     }
 }
 async function main() {
-    if (getPositionalCliCommand(process.argv) === "auth") {
+    const cli = resolveCli(process.argv);
+    if (cli.kind === "help") {
+        process.stdout.write(cli.text);
+        process.exit(0);
+    }
+    if (cli.kind === "usage" || cli.kind === "refused") {
+        process.stderr.write(`${cli.message}\n`);
+        process.exit(2);
+    }
+    if (cli.kind === "auth" || getPositionalCliCommand(process.argv) === "auth") {
         try {
             await runAuthCommandAsync();
             process.exit(0);
@@ -11828,8 +12068,53 @@ async function main() {
             process.exit(1);
         }
     }
+    if (cli.kind === "run") {
+        if (!hasCliCredentials()) {
+            process.stderr.write("Missing GitLab credentials. Set --token or GITLAB_PERSONAL_ACCESS_TOKEN, or run `auth` with GITLAB_USE_OAUTH=true.\n");
+            process.exit(2);
+        }
+        try {
+            const result = await handleToolCall({ name: cli.toolName, arguments: cli.args });
+            const masked = maskCliToolResult(cli.toolName, result);
+            const formatted = formatToolOutput({
+                result: masked,
+                mode: cli.output,
+                tableSpec: cli.tableSpec,
+            });
+            if (formatted.stderr) {
+                process.stderr.write(formatted.stderr);
+            }
+            process.stdout.write(formatted.stdout);
+            process.exit(formatted.isError ? 1 : 0);
+        }
+        catch (error) {
+            process.stderr.write(formatCliError(error));
+            logger.error({ err: error }, "cli command failed");
+            process.exit(1);
+        }
+    }
     await runServer();
 }
+function hasCliCredentials() {
+    return Boolean(GITLAB_PERSONAL_ACCESS_TOKEN || GITLAB_JOB_TOKEN || GITLAB_AUTH_COOKIE_PATH || USE_OAUTH);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function maskCliToolResult(toolName, result) {
+    const gitlabInstance = getConfig("api-url", "GITLAB_API_URL") || "https://gitlab.com";
+    const engine = maskingPolicyResolver?.select({
+        gitlabInstance,
+        allowBuiltinForUnscoped: true,
+    });
+    if (!engine || !isRecord(result)) {
+        return result;
+    }
+    const isPlainText = toolName === "get_pipeline_job_output" ||
+        toolName === "get_job_artifact_file" ||
+        (toolName === "download_release_asset" && !IS_REMOTE);
+    return engine.maskToolResult(result, { textFormat: isPlainText ? "plain" : "json" });
+}
 main().catch(error => {
     logger.fatal({ err: error }, "Fatal error in main()");
     process.exit(1);