@zereight/mcp-gitlab 2.1.49 → 2.1.50

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.48`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
+전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.1.49`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
 
 #### CLI 인자 사용하기(환경 변수 문제가 있는 클라이언트용)
 

package/README.md

@@ -1,6 +1,6 @@
 # GitLab MCP Server
 
-[![MCP Toplist](https://mcptoplist.com/badge/io.github.zereight%2Fgitlab-mcp.svg)](https://mcptoplist.com/server/io.github.zereight%2Fgitlab-mcp)
+[![MCP Toplist](https://mcptoplist.com/badge/io.github.zereight%2Fgitlab-mcp.svg)](https://mcptoplist.com/server/io.github.zereight%2Fgitlab-mcp) [![mcpindex](https://mcpindex.ai/api/v1/badge/io-github-zereight-gitlab-mcp)](https://mcpindex.ai/server/io-github-zereight-gitlab-mcp)
 
 [English](./README.md) | [한국어](./README.ko.md) | [简体中文](./README.zh-CN.md)
 
@@ -82,7 +82,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.48`. 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.49`. 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.48`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
+如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.1.49`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
 
 #### 使用 CLI 参数（适用于环境变量有问题的客户端）
 

package/build/schemas.js

@@ -1160,6 +1160,7 @@ export const GitLabMergeRequestSchema = z.object({
     updated_at: z.string(),
     merged_at: z.string().nullable(),
     closed_at: z.string().nullable(),
+    sha: z.string().optional().describe("SHA of the head commit in the source branch"),
     merge_commit_sha: z.string().nullable(),
     merge_user: GitLabUserSchema.nullable()
         .optional()
@@ -1773,6 +1774,10 @@ export const UpdateMergeRequestSchema = MergeRequestParamsSchema.extend({
 });
 export const MergeMergeRequestSchema = ProjectParamsSchema.extend({
     merge_request_iid: z.coerce.string().optional().describe("The IID of a merge request"),
+    sha: z
+        .string()
+        .optional()
+        .describe("SHA of the source-branch HEAD from get_merge_request (`sha` or `diff_refs.head_sha`). If provided, GitLab merges only when HEAD still matches. GitLab 19.2+ groups may require this (Require a commit SHA on the merge requests API)."),
     auto_merge: z.coerce
         .boolean()
         .optional()

package/build/test/merge-merge-request-schema.test.js

@@ -0,0 +1,75 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { GitLabMergeRequestSchema, MergeMergeRequestSchema } from "../schemas.js";
+const HEAD_SHA = "e82eb4a098e32c796079ca3915e07487fc4db24c";
+const PROJECT_ID = "group/project";
+const MERGE_REQUEST_IID = "42";
+function mergeArgs(overrides = {}) {
+    return {
+        project_id: PROJECT_ID,
+        merge_request_iid: MERGE_REQUEST_IID,
+        ...overrides,
+    };
+}
+function mergeRequest(overrides = {}) {
+    return {
+        id: "1001",
+        iid: MERGE_REQUEST_IID,
+        project_id: "123",
+        title: "Add milestone exposure",
+        description: "Expose MR milestone",
+        state: "opened",
+        author: {
+            id: "1",
+            username: "octocat",
+            name: "Octo Cat",
+            avatar_url: null,
+            web_url: "https://gitlab.example.com/octocat",
+        },
+        assignees: [],
+        reviewers: [],
+        source_branch: "feature/milestone",
+        target_branch: "main",
+        web_url: "https://gitlab.example.com/group/project/-/merge_requests/42",
+        created_at: "2026-05-07T00:00:00.000Z",
+        updated_at: "2026-05-07T00:00:00.000Z",
+        merged_at: null,
+        closed_at: null,
+        merge_commit_sha: null,
+        ...overrides,
+    };
+}
+describe("When parsing merge_merge_request arguments", () => {
+    describe("with sha provided", () => {
+        it("should keep sha on the parsed object", () => {
+            const parsed = MergeMergeRequestSchema.parse(mergeArgs({ sha: HEAD_SHA }));
+            assert.strictEqual(parsed.sha, HEAD_SHA);
+        });
+    });
+    describe("with sha omitted", () => {
+        it("should parse and leave sha undefined", () => {
+            const parsed = MergeMergeRequestSchema.parse(mergeArgs());
+            assert.strictEqual(parsed.sha, undefined);
+        });
+    });
+    describe("with an unknown extra field", () => {
+        it("should strip the unknown field", () => {
+            const parsed = MergeMergeRequestSchema.parse(mergeArgs({ not_a_schema_field: "drop-me" }));
+            assert.equal("not_a_schema_field" in parsed, false);
+        });
+    });
+});
+describe("When parsing a GitLab merge request response", () => {
+    describe("with sha present", () => {
+        it("should keep sha instead of stripping it", () => {
+            const parsed = GitLabMergeRequestSchema.parse(mergeRequest({ sha: HEAD_SHA }));
+            assert.strictEqual(parsed.sha, HEAD_SHA);
+        });
+    });
+    describe("with sha omitted", () => {
+        it("should accept the payload", () => {
+            const parsed = GitLabMergeRequestSchema.parse(mergeRequest());
+            assert.strictEqual(parsed.sha, undefined);
+        });
+    });
+});

package/build/tools/tool-descriptions.js

@@ -1,5 +1,5 @@
 const TOOL_GUIDANCE = {
-    merge_merge_request: "Use this only after checking the merge request approval, conflict, and pipeline state; use `approve_merge_request` to approve rather than merge. The operation changes repository state and may squash commits, schedule auto-merge, or delete the source branch, so it requires merge permission and returns GitLab's merge result or a mergeability error.",
+    merge_merge_request: "Use this only after checking the merge request approval, conflict, and pipeline state; use `approve_merge_request` to approve rather than merge. The operation changes repository state and may squash commits, schedule auto-merge, or delete the source branch, so it requires merge permission and returns GitLab's merge result or a mergeability error. Pass `sha` from `get_merge_request` (`sha` or `diff_refs.head_sha`); GitLab 19.2+ groups may reject merges without it.",
     approve_merge_request: "Use this to record an approval on an existing merge request; it does not merge the request or change its source branch. The operation changes review state, may require re-authentication or approval permission, and returns the updated approval result or a permission/state error.",
     unapprove_merge_request: "Use this to remove the current user's approval from an existing merge request; use `merge_merge_request` only when you intend to merge. The operation changes review state and requires approval permission, and GitLab returns the updated result or an error when the request or approval is unavailable.",
     get_merge_request_approval_state: "Use this to inspect approval rules and approvers before deciding whether a merge request can be merged; use `approve_merge_request` to change approval state. It is read-only and returns the approval-state response, while missing requests, unsupported GitLab versions, and permission failures are reported as errors.",

package/package.json

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