@zereight/mcp-gitlab 2.3.2 → 2.3.3

package/README.ko.md

@@ -138,7 +138,7 @@ command = lib.getExe inputs.gitlab-mcp.packages.${system}.default;
 
 예시는 기존 `mcp-gitlab`보다 충돌 가능성이 낮은 `zereight-mcp-gitlab` 별칭을 사용합니다. MCP 클라이언트가 찾지 못하면 `which zereight-mcp-gitlab`의 절대 경로를 사용하세요.
 
-전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.3.1`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
+전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.3.2`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
 
 #### Claude Desktop 원클릭 설치(MCP Bundle)
 

package/README.md

@@ -143,7 +143,7 @@ The store path is pinned by your lock file; update it with `nix flake update git
 
 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.3.1`. 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.3.2`. 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`).
 
 #### Claude Desktop one-click install (MCP Bundle)
 

package/README.pt-BR.md

@@ -138,7 +138,7 @@ O caminho no store é fixado pelo seu lock file; atualize-o com `nix flake updat
 
 Os exemplos usam `zereight-mcp-gitlab`, um alias com menor chance de conflito que o binário legado `mcp-gitlab`. Se o seu cliente MCP não o encontrar, use o caminho absoluto retornado por `which zereight-mcp-gitlab`.
 
-Não quer instalar globalmente? Fixe o `npx` na versão estável anterior (a versão recomendada por esta documentação), por exemplo `npx -y @zereight/mcp-gitlab@2.3.1`. Se quiser sempre a versão mais recente, use `npx -y @zereight/mcp-gitlab@latest`. O servidor exibe um aviso no stderr durante a inicialização quando existe uma versão mais nova disponível (desative com `GITLAB_DISABLE_VERSION_CHECK=true`).
+Não quer instalar globalmente? Fixe o `npx` na versão estável anterior (a versão recomendada por esta documentação), por exemplo `npx -y @zereight/mcp-gitlab@2.3.2`. Se quiser sempre a versão mais recente, use `npx -y @zereight/mcp-gitlab@latest`. O servidor exibe um aviso no stderr durante a inicialização quando existe uma versão mais nova disponível (desative com `GITLAB_DISABLE_VERSION_CHECK=true`).
 
 #### Instalação com um clique no Claude Desktop (MCP Bundle)
 

package/README.zh-CN.md

@@ -138,7 +138,7 @@ command = lib.getExe inputs.gitlab-mcp.packages.${system}.default;
 
 示例使用 `zereight-mcp-gitlab`，这是比旧的 `mcp-gitlab` 更不容易冲突的别名。如果 MCP 客户端找不到它，请使用 `which zereight-mcp-gitlab` 输出的绝对路径。
 
-如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.3.1`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
+如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.3.2`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
 
 #### Claude Desktop 一键安装（MCP Bundle）
 

package/build/index.js

@@ -6363,6 +6363,74 @@ async function erasePipelineJob(projectId, jobId) {
 const TERMINAL_PIPELINE_STATUSES = new Set(["success", "failed", "canceled", "skipped", "manual"]);
 const TERMINAL_JOB_STATUSES = new Set(["success", "failed", "canceled", "skipped", "manual"]);
 const TERMINAL_REBASE_STATUSES = new Set(["finished"]);
+// GitLab accepts PUT .../rebase before Sidekiq starts the job. Until then, GET
+// with include_rebase_in_progress can still say rebase_in_progress=false and return
+// the pre-rebase sha (gitlab-org/gitlab-foss#57481). Recheck that snapshot a few
+// times, capped so the default 5s poll interval cannot stretch this into 15s.
+const REBASE_UNCHANGED_HEAD_RECHECK_LIMIT = 3;
+const REBASE_UNCHANGED_HEAD_RECHECK_INTERVAL_CAP_MS = 1000;
+function rebaseHeadMoved(previous, current) {
+    return current.sha !== previous.sha;
+}
+function rebaseFailureExplained(previous, current) {
+    const mergeError = current.merge_error;
+    if (typeof mergeError !== "string" || mergeError.length === 0) {
+        return false;
+    }
+    return mergeError !== previous.merge_error;
+}
+function delayForRebasePoll(delayMs) {
+    return new Promise(resolve => {
+        setTimeout(resolve, delayMs);
+    });
+}
+async function getMergeRequestRebaseStatusBeforeDeadline(projectId, mergeRequestIid, deadline) {
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) {
+        throw new Error("Timed out waiting for terminal status");
+    }
+    return getMergeRequestRebaseStatus(projectId, mergeRequestIid, AbortSignal.timeout(remaining));
+}
+/**
+ * Poll until a rebase finishes, without trusting a finished snapshot that still
+ * has the pre-rebase sha and no new merge_error. A later rebase_in_progress true
+ * means the job did start, so wait for that terminal status as usual. Rechecks
+ * share the caller's timeout and never add time beyond it.
+ */
+async function waitForMergeRequestRebase(projectId, mergeRequestIid, previous, timeoutSeconds = 300, pollIntervalSeconds = 5) {
+    const deadline = Date.now() + timeoutSeconds * 1000;
+    let snapshot = await getMergeRequestRebaseStatusBeforeDeadline(projectId, mergeRequestIid, deadline);
+    let rechecksRemaining = REBASE_UNCHANGED_HEAD_RECHECK_LIMIT;
+    while (true) {
+        if (!TERMINAL_REBASE_STATUSES.has(snapshot.status)) {
+            rechecksRemaining = 0;
+            const remaining = deadline - Date.now();
+            if (remaining <= 0) {
+                break;
+            }
+            await delayForRebasePoll(Math.min(pollIntervalSeconds * 1000, remaining));
+            snapshot = await getMergeRequestRebaseStatusBeforeDeadline(projectId, mergeRequestIid, deadline);
+            continue;
+        }
+        const mergeRequest = snapshot.mergeRequest;
+        if (rebaseHeadMoved(previous, mergeRequest) || rebaseFailureExplained(previous, mergeRequest)) {
+            return mergeRequest;
+        }
+        if (rechecksRemaining <= 0) {
+            return mergeRequest;
+        }
+        const remaining = deadline - Date.now();
+        const delay = Math.min(pollIntervalSeconds * 1000, REBASE_UNCHANGED_HEAD_RECHECK_INTERVAL_CAP_MS, remaining);
+        // The next poll has to land inside the timeout. If one full backoff does not fit, stop.
+        if (remaining <= 0 || delay >= remaining) {
+            return mergeRequest;
+        }
+        rechecksRemaining -= 1;
+        await delayForRebasePoll(delay);
+        snapshot = await getMergeRequestRebaseStatusBeforeDeadline(projectId, mergeRequestIid, deadline);
+    }
+    throw new Error(`Timed out waiting for terminal status; last status: ${snapshot.status}`);
+}
 async function waitForStatus(fetchStatus, terminalStatuses, timeoutSeconds = 300, pollIntervalSeconds = 5) {
     const deadline = Date.now() + timeoutSeconds * 1000;
     const fetchBeforeDeadline = async () => {
@@ -8771,11 +8839,11 @@ async function handleToolCall(params) {
                 }
                 const { mergeRequest: previous } = await getMergeRequestRebaseStatus(project_id, merge_request_iid);
                 await rebaseMergeRequest(project_id, merge_request_iid, skip_ci);
-                const { mergeRequest } = await waitForStatus(signal => getMergeRequestRebaseStatus(project_id, merge_request_iid, signal), TERMINAL_REBASE_STATUSES, timeout_seconds, poll_interval_seconds);
+                const mergeRequest = await waitForMergeRequestRebase(project_id, merge_request_iid, previous, timeout_seconds, poll_interval_seconds);
                 const rebaseResult = {
                     ...mergeRequest,
                     previous_sha: previous.sha,
-                    head_changed: mergeRequest.sha !== previous.sha,
+                    head_changed: rebaseHeadMoved(previous, mergeRequest),
                 };
                 return { content: [{ type: "text", text: JSON.stringify(rebaseResult) }] };
             }

package/package.json

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