@zereight/mcp-gitlab 2.1.41 → 2.1.42

package/README.ko.md

@@ -80,7 +80,7 @@ npm install -g @zereight/mcp-gitlab
 
 예시는 기존 `mcp-gitlab`보다 충돌 가능성이 낮은 `zereight-mcp-gitlab` 별칭을 사용합니다. MCP 클라이언트가 찾지 못하면 `which zereight-mcp-gitlab`의 절대 경로를 사용하세요.
 
-전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.1.40`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
+전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.1.41`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
 
 #### CLI 인자 사용하기(환경 변수 문제가 있는 클라이언트용)
 

package/README.md

@@ -80,7 +80,7 @@ npm install -g @zereight/mcp-gitlab
 
 The examples use `zereight-mcp-gitlab`, a less collision-prone alias for the legacy `mcp-gitlab` binary. If your MCP client cannot find it, use the absolute path from `which zereight-mcp-gitlab`.
 
-No global install? Pin `npx` to the previous stable release (the version these docs recommend), for example `npx -y @zereight/mcp-gitlab@2.1.40`. If you always want the newest release, use `npx -y @zereight/mcp-gitlab@latest` instead. The server prints a notice to stderr on startup when a newer version is available (disable with `GITLAB_DISABLE_VERSION_CHECK=true`).
+No global install? Pin `npx` to the previous stable release (the version these docs recommend), for example `npx -y @zereight/mcp-gitlab@2.1.41`. If you always want the newest release, use `npx -y @zereight/mcp-gitlab@latest` instead. The server prints a notice to stderr on startup when a newer version is available (disable with `GITLAB_DISABLE_VERSION_CHECK=true`).
 
 #### Using CLI Arguments (for clients with env var issues)
 

package/README.zh-CN.md

@@ -80,7 +80,7 @@ npm install -g @zereight/mcp-gitlab
 
 示例使用 `zereight-mcp-gitlab`，这是比旧的 `mcp-gitlab` 更不容易冲突的别名。如果 MCP 客户端找不到它，请使用 `which zereight-mcp-gitlab` 输出的绝对路径。
 
-如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.1.40`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
+如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.1.41`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
 
 #### 使用 CLI 参数（适用于环境变量有问题的客户端）
 

package/build/index.js

@@ -90,6 +90,8 @@ import { graphqlQueryContainsWriteOperation, graphqlQueryContainsDeleteOperation
 import { resolveNestedWikiUpdateTitle } from "./utils/wiki-title.js";
 import { redactSensitiveGitLabFields } from "./utils/redact-sensitive.js";
 import { checkForNewVersion } from "./utils/version-check.js";
+import { assertGitLabVersionAtLeast } from "./utils/gitlab-version-gate.js";
+import { buildBulkPublishDraftNotesBody, needsGitLab19_2BulkPublish, } from "./utils/bulk-publish-options.js";
 import { cleanMutuallyExclusiveIdUsernameOptions, LIST_MERGE_REQUESTS_ID_USERNAME_PAIRS, sanitizeToolArguments, } from "./utils/tool-args.js";
 import { parseSearchReplaceBlocks, applySearchReplace, applyUnifiedDiff, } from "./utils/patch-helper.js";
 import { requireBearerAuth } from "@modelcontextprotocol/sdk/server/auth/middleware/bearerAuth.js";
@@ -4424,19 +4426,49 @@ async function publishDraftNote(projectId, mergeRequestIid, draftNoteId) {
         };
     }
 }
+async function fetchGitLabInstanceVersion() {
+    try {
+        const response = await fetch(`${getEffectiveApiUrl()}/version`, {
+            ...getFetchConfig(),
+        });
+        if (!response.ok)
+            return null;
+        const data = await response.json();
+        if (typeof data === "object" &&
+            data !== null &&
+            "version" in data &&
+            typeof data.version === "string") {
+            return data.version;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Publish all draft notes for a merge request
  * @param {string} projectId - The ID or URL-encoded path of the project
  * @param {number|string} mergeRequestIid - The internal ID of the merge request
+ * @param {BulkPublishDraftNotesBody} options - Optional GitLab 19.2+ bulk_publish body fields
  * @returns {Promise<GitLabDiscussionNote[]>} Array of published notes
  */
-async function bulkPublishDraftNotes(projectId, mergeRequestIid) {
+async function bulkPublishDraftNotes(projectId, mergeRequestIid, options = {}) {
     projectId = decodeURIComponent(projectId);
     const url = new URL(`${getEffectiveApiUrl()}/projects/${encodeURIComponent(getEffectiveProjectId(projectId))}/merge_requests/${encodeGitLabPathSegment(mergeRequestIid)}/draft_notes/bulk_publish`);
+    const body = buildBulkPublishDraftNotesBody(options);
+    if (needsGitLab19_2BulkPublish(body)) {
+        await assertGitLabVersionAtLeast({
+            major: 19,
+            minor: 2,
+            feature: "reviewer_state, note, and internal on bulk_publish_draft_notes",
+            retryHint: "Omit reviewer_state, note, and internal, then retry.",
+        }, fetchGitLabInstanceVersion);
+    }
     const response = await fetch(url.toString(), {
         ...getFetchConfig(),
         method: "POST", // Changed from PUT to POST
-        body: JSON.stringify({}), // Send empty body for POST request
+        body: JSON.stringify(body),
     });
     if (!response.ok) {
         const errorText = await response.text();
@@ -7612,8 +7644,8 @@ async function handleToolCall(params) {
             }
             case "bulk_publish_draft_notes": {
                 const args = BulkPublishDraftNotesSchema.parse(params.arguments);
-                const { project_id, merge_request_iid } = args;
-                const publishedNotes = await bulkPublishDraftNotes(project_id, merge_request_iid);
+                const { project_id, merge_request_iid, ...options } = args;
+                const publishedNotes = await bulkPublishDraftNotes(project_id, merge_request_iid, options);
                 return {
                     content: [{ type: "text", text: JSON.stringify(publishedNotes) }],
                 };

package/build/schemas.js

@@ -2547,26 +2547,31 @@ export const MergeRequestThreadPositionSchema = z.object({
 });
 const optionalMergeRequestThreadPosition = z.preprocess(omitIncompleteMergeRequestPosition, MergeRequestThreadPositionSchema.optional());
 // Draft Notes API schemas
+// Response shape follows Draft Notes API (not Notes API): note, author_id,
+// line_code, merge_request_id, commit_id — no created_at/updated_at.
 export const GitLabDraftNoteSchema = z
     .object({
     id: z.coerce.string(),
+    author_id: z.coerce.number().nullable().optional(),
     author: GitLabUserSchema.optional(),
     body: z.string().optional(),
-    note: z.string().optional(), // Some APIs might use 'note' instead of 'body'
-    created_at: z.string().optional(),
-    updated_at: z.string().optional(),
+    note: z.string().optional(), // Draft Notes API uses 'note'; keep 'body' for callers
+    line_code: z.string().nullable().optional(),
+    merge_request_id: z.coerce.number().nullable().optional(),
+    commit_id: z.string().nullable().optional(),
     discussion_id: z.string().nullable().optional(),
     position: z.record(z.unknown()).nullable().optional(),
     resolve_discussion: z.coerce.boolean().optional(),
 })
     .transform(data => ({
-    // Normalize the response to always have consistent field names
     id: data.id,
+    author_id: data.author_id ?? null,
     author: data.author,
     body: data.body || data.note || "",
-    created_at: data.created_at || "",
-    updated_at: data.updated_at || "",
-    discussion_id: data.discussion_id || null,
+    line_code: data.line_code ?? null,
+    merge_request_id: data.merge_request_id ?? null,
+    commit_id: data.commit_id ?? null,
+    discussion_id: data.discussion_id ?? null,
     position: data.position,
     resolve_discussion: data.resolve_discussion,
 }));
@@ -2617,6 +2622,18 @@ export const PublishDraftNoteSchema = ProjectParamsSchema.extend({
 // Bulk publish draft notes schema
 export const BulkPublishDraftNotesSchema = ProjectParamsSchema.extend({
     merge_request_iid: z.coerce.string().describe("The IID of a merge request"),
+    reviewer_state: z
+        .enum(["requested_changes", "reviewed"])
+        .optional()
+        .describe("Set reviewer review state after publishing (GitLab 19.2+). Does not record a formal approval. Works even with no draft notes."),
+    note: z
+        .string()
+        .optional()
+        .describe("Summary note body to post on the merge request (GitLab 19.2+)"),
+    internal: z.coerce
+        .boolean()
+        .optional()
+        .describe("If true, the summary note is internal (GitLab 19.2+, default false)"),
 });
 // Schema for creating a new merge request thread
 export const CreateMergeRequestThreadSchema = ProjectParamsSchema.extend({

package/build/test/draft-note-schema.test.js

@@ -0,0 +1,44 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { GitLabDraftNoteSchema } from "../schemas.js";
+test("draft note schema keeps Draft Notes API fields and drops fake timestamps", () => {
+    const parsed = GitLabDraftNoteSchema.parse({
+        id: 42,
+        author_id: 7,
+        note: "looks wrong on this line",
+        line_code: "a1b2c3d4e5f6_12_17",
+        merge_request_id: 99,
+        commit_id: "abc123",
+        discussion_id: null,
+        position: { new_path: "src/app.ts", new_line: 17 },
+        resolve_discussion: false,
+        // Notes-API leftovers that Draft Notes API never returns — must be stripped
+        created_at: "2024-01-01T00:00:00Z",
+        updated_at: "2024-01-02T00:00:00Z",
+    });
+    assert.equal(parsed.id, "42");
+    assert.equal(parsed.author_id, 7);
+    assert.equal(parsed.body, "looks wrong on this line");
+    assert.equal(parsed.line_code, "a1b2c3d4e5f6_12_17");
+    assert.equal(parsed.merge_request_id, 99);
+    assert.equal(parsed.commit_id, "abc123");
+    assert.equal(parsed.discussion_id, null);
+    assert.equal(parsed.resolve_discussion, false);
+    assert.equal("created_at" in parsed, false);
+    assert.equal("updated_at" in parsed, false);
+});
+test("draft note schema preserves null line_code for unresolved positions", () => {
+    const parsed = GitLabDraftNoteSchema.parse({
+        id: "43",
+        author_id: 7,
+        note: "orphan draft",
+        line_code: null,
+        merge_request_id: 99,
+        commit_id: null,
+        discussion_id: null,
+        position: null,
+        resolve_discussion: false,
+    });
+    assert.equal(parsed.line_code, null);
+    assert.equal(parsed.commit_id, null);
+});

package/build/test/utils/bulk-publish-options.test.js

@@ -0,0 +1,32 @@
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import { buildBulkPublishDraftNotesBody, needsGitLab19_2BulkPublish, } from "../../utils/bulk-publish-options.js";
+describe("When buildBulkPublishDraftNotesBody runs", () => {
+    describe("with no-op defaults", () => {
+        test("should omit internal false and empty note", () => {
+            assert.deepEqual(buildBulkPublishDraftNotesBody({ internal: false, note: "" }), {});
+        });
+    });
+    describe("with meaningful 19.2 fields", () => {
+        test("should keep reviewer_state, note, and internal true", () => {
+            assert.deepEqual(buildBulkPublishDraftNotesBody({
+                reviewer_state: "reviewed",
+                note: "LGTM",
+                internal: true,
+            }), { reviewer_state: "reviewed", note: "LGTM", internal: true });
+        });
+    });
+});
+describe("When needsGitLab19_2BulkPublish runs", () => {
+    describe("with an empty body", () => {
+        test("should return false", () => {
+            assert.equal(needsGitLab19_2BulkPublish({}), false);
+            assert.equal(needsGitLab19_2BulkPublish(buildBulkPublishDraftNotesBody({ internal: false })), false);
+        });
+    });
+    describe("with a non-empty body", () => {
+        test("should return true", () => {
+            assert.equal(needsGitLab19_2BulkPublish({ reviewer_state: "reviewed" }), true);
+        });
+    });
+});

package/build/test/utils/gitlab-version-gate.test.js

@@ -0,0 +1,74 @@
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import { assertGitLabVersionAtLeast, isGitLabVersionAtLeast, parseGitLabVersion, } from "../../utils/gitlab-version-gate.js";
+function versionFetcher(version) {
+    return async () => version;
+}
+function bulkPublishRequirement() {
+    return {
+        major: 19,
+        minor: 2,
+        feature: "reviewer_state, note, and internal on bulk_publish_draft_notes",
+        retryHint: "Omit reviewer_state, note, and internal, then retry.",
+    };
+}
+describe("When parseGitLabVersion runs", () => {
+    describe("with a release suffix", () => {
+        test("should parse major.minor.patch from ee builds", () => {
+            assert.deepEqual(parseGitLabVersion("19.2.0-ee"), {
+                major: 19,
+                minor: 2,
+                patch: 0,
+            });
+        });
+    });
+    describe("with a malformed string", () => {
+        test("should return null", () => {
+            assert.equal(parseGitLabVersion("unknown"), null);
+            assert.equal(parseGitLabVersion(""), null);
+        });
+    });
+});
+describe("When isGitLabVersionAtLeast compares versions", () => {
+    describe("with a version at or above the floor", () => {
+        test("should return true", () => {
+            assert.equal(isGitLabVersionAtLeast("19.2.0-ee", 19, 2), true);
+            assert.equal(isGitLabVersionAtLeast("19.3.1", 19, 2), true);
+            assert.equal(isGitLabVersionAtLeast("20.0.0", 19, 2), true);
+        });
+    });
+    describe("with a version below the floor", () => {
+        test("should return false", () => {
+            assert.equal(isGitLabVersionAtLeast("19.1.9-ee", 19, 2), false);
+            assert.equal(isGitLabVersionAtLeast("17.5.0", 19, 2), false);
+        });
+    });
+    describe("with an unparseable version", () => {
+        test("should return null", () => {
+            assert.equal(isGitLabVersionAtLeast("not-a-version", 19, 2), null);
+        });
+    });
+});
+describe("When assertGitLabVersionAtLeast runs", () => {
+    describe("with an older instance version", () => {
+        test("should throw a retryable error", async () => {
+            await assert.rejects(() => assertGitLabVersionAtLeast(bulkPublishRequirement(), versionFetcher("17.5.0-ee")), (error) => {
+                assert.ok(error instanceof Error);
+                assert.match(error.message, /GitLab 19\.2\+/);
+                assert.match(error.message, /17\.5\.0-ee/);
+                assert.match(error.message, /Omit reviewer_state/);
+                return true;
+            });
+        });
+    });
+    describe("with a new enough instance version", () => {
+        test("should resolve without throwing", async () => {
+            await assertGitLabVersionAtLeast(bulkPublishRequirement(), versionFetcher("19.2.0-ee"));
+        });
+    });
+    describe("with an unknown instance version", () => {
+        test("should fail open and resolve", async () => {
+            await assertGitLabVersionAtLeast(bulkPublishRequirement(), versionFetcher(null));
+        });
+    });
+});

package/build/tools/registry.js

@@ -267,7 +267,7 @@ export const allTools = [
     },
     {
         name: "bulk_publish_draft_notes",
-        description: "Publish all draft notes for a merge request",
+        description: "Publish all draft notes for a merge request. Optionally sets reviewer_state and posts a summary note (GitLab 19.2+). Can set reviewer_state even with no drafts.",
         inputSchema: toJSONSchema(BulkPublishDraftNotesSchema),
     },
     // --- Merge request emoji reaction tools ---

package/build/utils/bulk-publish-options.js

@@ -0,0 +1,21 @@
+/**
+ * Build the POST body. Omit no-op defaults (`internal: false`, empty `note`)
+ * so older GitLab instances are not sent unknown fields.
+ */
+export function buildBulkPublishDraftNotesBody(options) {
+    const body = {};
+    if (options.reviewer_state !== undefined) {
+        body.reviewer_state = options.reviewer_state;
+    }
+    if (options.note) {
+        body.note = options.note;
+    }
+    if (options.internal === true) {
+        body.internal = true;
+    }
+    return body;
+}
+/** True when the body needs GitLab 19.2+ bulk_publish fields. */
+export function needsGitLab19_2BulkPublish(body) {
+    return Object.keys(body).length > 0;
+}

package/build/utils/gitlab-version-gate.js

@@ -0,0 +1,47 @@
+/**
+ * Call-time GitLab instance version gate.
+ *
+ * Use when a tool exposes optional params that only exist on newer GitLab.
+ * Schemas stay static; check before the API call and throw a retryable error.
+ * Fail-open when the instance version cannot be fetched or parsed.
+ */
+const VERSION_CORE = /^(\d+)\.(\d+)(?:\.(\d+))?/;
+/** Parse strings like "19.2.0-ee" / "17.5.3". Returns null if unparseable. */
+export function parseGitLabVersion(version) {
+    const match = VERSION_CORE.exec(version.trim());
+    if (!match)
+        return null;
+    const major = Number.parseInt(match[1], 10);
+    const minor = Number.parseInt(match[2], 10);
+    const patch = match[3] ? Number.parseInt(match[3], 10) : 0;
+    if (!Number.isFinite(major) || !Number.isFinite(minor) || !Number.isFinite(patch)) {
+        return null;
+    }
+    return { major, minor, patch };
+}
+/**
+ * Compare a GitLab version string against a major.minor floor.
+ * Returns null when the version string cannot be parsed.
+ */
+export function isGitLabVersionAtLeast(version, major, minor) {
+    const parsed = parseGitLabVersion(version);
+    if (!parsed)
+        return null;
+    if (parsed.major !== major)
+        return parsed.major > major;
+    return parsed.minor >= minor;
+}
+/**
+ * Throws when the instance is known to be older than `requirement`.
+ * Does nothing when the version is unknown (fail-open).
+ */
+export async function assertGitLabVersionAtLeast(requirement, fetchVersion) {
+    const current = await fetchVersion();
+    if (current === null)
+        return;
+    const ok = isGitLabVersionAtLeast(current, requirement.major, requirement.minor);
+    if (ok === null || ok)
+        return;
+    throw new Error(`GitLab ${requirement.major}.${requirement.minor}+ required for ${requirement.feature} ` +
+        `(instance reports ${current}). ${requirement.retryHint}`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "2.1.41",
+  "version": "2.1.42",
   "mcpName": "io.github.zereight/gitlab-mcp",
   "description": "GitLab MCP server for projects, merge requests, issues, pipelines, wiki, releases, and more",
   "keywords": [