@zereight/mcp-gitlab 2.0.30 → 2.0.32

package/build/test/test-merge-request-approval-state-tools.js

@@ -0,0 +1,171 @@
+import { after, before, describe, test } from "node:test";
+import assert from "node:assert";
+import { spawn } from "child_process";
+import { MockGitLabServer, findMockServerPort } from "./utils/mock-gitlab-server.js";
+const MOCK_TOKEN = "glpat-mock-token-approval";
+const TEST_PROJECT_ID = "123";
+const TEST_MR_IID_WITH_FALLBACK = "88";
+const TEST_MR_IID_WITH_APPROVAL_STATE = "89";
+async function callTool(toolName, args, env) {
+    return new Promise((resolve, reject) => {
+        const proc = spawn("node", ["build/index.js"], {
+            stdio: ["pipe", "pipe", "pipe"],
+            env: {
+                ...process.env,
+                ...env,
+                GITLAB_READ_ONLY_MODE: "true",
+                USE_PIPELINE: "true",
+            },
+        });
+        let output = "";
+        let errorOutput = "";
+        proc.stdout?.on("data", (d) => (output += d));
+        proc.stderr?.on("data", (d) => (errorOutput += d));
+        proc.on("close", (code) => {
+            if (code !== 0) {
+                return reject(new Error(`Process exited with code ${code}: ${errorOutput}`));
+            }
+            const line = output.split("\n").find(l => l.startsWith("{"));
+            if (!line) {
+                return reject(new Error("No JSON output found"));
+            }
+            try {
+                const response = JSON.parse(line);
+                if (response.error) {
+                    reject(response.error);
+                }
+                else {
+                    const content = response.result?.content?.[0]?.text;
+                    if (content) {
+                        try {
+                            resolve(JSON.parse(content));
+                        }
+                        catch {
+                            resolve(content);
+                        }
+                    }
+                    else {
+                        resolve(response.result);
+                    }
+                }
+            }
+            catch (error) {
+                reject(error);
+            }
+        });
+        proc.stdin?.end(JSON.stringify({
+            jsonrpc: "2.0",
+            id: 1,
+            method: "tools/call",
+            params: { name: toolName, arguments: args },
+        }) + "\n");
+    });
+}
+describe("merge request approval state tools", () => {
+    let mockGitLab;
+    let mockGitLabUrl;
+    before(async () => {
+        const mockPort = await findMockServerPort(9400);
+        mockGitLab = new MockGitLabServer({
+            port: mockPort,
+            validTokens: [MOCK_TOKEN],
+        });
+        mockGitLab.addMockHandler("get", `/projects/${TEST_PROJECT_ID}/merge_requests/${TEST_MR_IID_WITH_FALLBACK}/approval_state`, (_req, res) => {
+            res.status(404).json({ error: "404 Not Found" });
+        });
+        mockGitLab.addMockHandler("get", `/projects/${TEST_PROJECT_ID}/merge_requests/${TEST_MR_IID_WITH_FALLBACK}/approvals`, (_req, res) => {
+            res.json({
+                approved: true,
+                user_has_approved: false,
+                user_can_approve: true,
+                approved_by: [
+                    {
+                        user: {
+                            id: "35",
+                            username: "sergey.kravchenya",
+                            name: "Sergey Kravchenya",
+                            state: "active",
+                            avatar_url: "https://gitlab.mock/uploads/avatar.png",
+                            web_url: "https://gitlab.mock/sergey.kravchenya",
+                        },
+                    },
+                ],
+            });
+        });
+        mockGitLab.addMockHandler("get", `/projects/${TEST_PROJECT_ID}/merge_requests/${TEST_MR_IID_WITH_APPROVAL_STATE}/approval_state`, (_req, res) => {
+            res.json({
+                approval_rules_overwritten: false,
+                rules: [
+                    {
+                        id: "101",
+                        name: "Default rule",
+                        rule_type: "regular",
+                        approvals_required: 1,
+                        approved: true,
+                        approved_by: [
+                            {
+                                id: "35",
+                                username: "sergey.kravchenya",
+                                name: "Sergey Kravchenya",
+                                state: "active",
+                                avatar_url: "https://gitlab.mock/uploads/avatar.png",
+                                web_url: "https://gitlab.mock/sergey.kravchenya",
+                            },
+                        ],
+                    },
+                    {
+                        id: "102",
+                        name: "Code owners",
+                        rule_type: "code_owner",
+                        approvals_required: 1,
+                        approved: true,
+                        approved_by: [
+                            {
+                                id: "35",
+                                username: "sergey.kravchenya",
+                                name: "Sergey Kravchenya",
+                                state: "active",
+                                avatar_url: "https://gitlab.mock/uploads/avatar.png",
+                                web_url: "https://gitlab.mock/sergey.kravchenya",
+                            },
+                        ],
+                    },
+                ],
+            });
+        });
+        await mockGitLab.start();
+        mockGitLabUrl = mockGitLab.getUrl();
+    });
+    after(async () => {
+        await mockGitLab.stop();
+    });
+    test("falls back to approvals endpoint when approval_state is unavailable", async () => {
+        const result = await callTool("get_merge_request_approval_state", {
+            project_id: TEST_PROJECT_ID,
+            merge_request_iid: TEST_MR_IID_WITH_FALLBACK,
+        }, {
+            GITLAB_API_URL: `${mockGitLabUrl}/api/v4`,
+            GITLAB_PERSONAL_ACCESS_TOKEN: MOCK_TOKEN,
+        });
+        assert.strictEqual(result.source_endpoint, "approvals");
+        assert.strictEqual(result.approved, true);
+        assert.deepStrictEqual(result.approved_by_usernames, ["sergey.kravchenya"]);
+        assert.ok(Array.isArray(result.approved_by));
+        assert.strictEqual(result.approved_by[0].username, "sergey.kravchenya");
+    });
+    test("returns deduplicated approvers from approval_state rules", async () => {
+        const result = await callTool("get_merge_request_approval_state", {
+            project_id: TEST_PROJECT_ID,
+            merge_request_iid: TEST_MR_IID_WITH_APPROVAL_STATE,
+        }, {
+            GITLAB_API_URL: `${mockGitLabUrl}/api/v4`,
+            GITLAB_PERSONAL_ACCESS_TOKEN: MOCK_TOKEN,
+        });
+        assert.strictEqual(result.source_endpoint, "approval_state");
+        assert.strictEqual(result.rules.length, 2);
+        assert.deepStrictEqual(result.approved_by_usernames, ["sergey.kravchenya"]);
+        assert.ok(Array.isArray(result.approved_by));
+        assert.strictEqual(result.approved_by.length, 1);
+        assert.strictEqual(result.approved_by[0].username, "sergey.kravchenya");
+    });
+});

package/build/test/test-toolset-filtering.js

@@ -35,10 +35,12 @@ const DEFAULT_TOOLSETS = [
     "branches",
     "projects",
     "labels",
+    "pipelines",
+    "milestones",
+    "wiki",
     "releases",
     "users",
 ];
-const NON_DEFAULT_TOOLSETS = ["pipelines", "milestones", "wiki"];
 const DEFAULT_TOOL_COUNT = DEFAULT_TOOLSETS.reduce((sum, id) => sum + TOOLSET_TOOL_COUNTS[id], 0);
 const ALL_TOOLSET_TOOL_COUNT = Object.values(TOOLSET_TOOL_COUNTS).reduce((sum, c) => sum + c, 0);
 // Representative tools per toolset for spot-checking
@@ -128,10 +130,9 @@ describe("Toolset Filtering", () => {
                 assertContainsAll(tools, TOOLSET_SAMPLE_TOOLS[id], id);
             }
         });
-        test("excludes non-default toolsets (pipelines, milestones, wiki)", () => {
-            for (const id of NON_DEFAULT_TOOLSETS) {
-                assertContainsNone(tools, TOOLSET_SAMPLE_TOOLS[id], id);
-            }
+        test("includes all toolsets by default (no non-default toolsets)", () => {
+            // All toolsets are now default, so default count equals all toolset count
+            assert.strictEqual(tools.length, ALL_TOOLSET_TOOL_COUNT);
         });
         test("excludes execute_graphql (not in any toolset)", () => {
             assertContainsNone(tools, ["execute_graphql"], "unassigned");
@@ -175,7 +176,7 @@ describe("Toolset Filtering", () => {
             assert.strictEqual(tools.length, ALL_TOOLSET_TOOL_COUNT);
         });
         test("includes pipelines, milestones, and wiki", () => {
-            for (const id of NON_DEFAULT_TOOLSETS) {
+            for (const id of ["pipelines", "milestones", "wiki"]) {
                 assertContainsAll(tools, TOOLSET_SAMPLE_TOOLS[id], id);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "description": "MCP server for using the GitLab API",
   "license": "MIT",
   "author": "zereight",
@@ -29,9 +29,10 @@
     "changelog": "auto-changelog -p",
     "test": "npm run test:all",
     "test:all": "npm run build && npm run test:mock && npm run test:live",
-    "test:mock": "npx tsx --test test/remote-auth-simple-test.ts && tsx test/oauth-tests.ts && tsx test/test-list-merge-requests.ts && tsx test/test-list-project-members.ts && tsx test/test-download-attachment.ts",
+    "test:mock": "npx tsx --test test/remote-auth-simple-test.ts && tsx test/oauth-tests.ts && tsx test/test-list-merge-requests.ts && tsx test/test-list-project-members.ts && tsx test/test-download-attachment.ts && tsx --test test/test-job-artifacts.ts && tsx --test test/test-deployment-tools.ts && tsx --test test/test-merge-request-approval-state-tools.ts",
     "test:live": "node test/validate-api.js",
     "test:remote-auth": "npm run build && npx tsx --test test/remote-auth-simple-test.ts",
+    "test:schema": "tsx test/schema-tests.ts",
     "test:oauth": "tsx test/oauth-tests.ts",
     "test:list-merge-requests": "npm run build && tsx test/test-list-merge-requests.ts",
     "test:approvals": "npm run build && tsx test/test-merge-request-approvals.ts",