opencode-gitlab-plugin 2.6.0 → 2.7.0

package/dist/mcp-server.cjs

@@ -29088,6 +29088,29 @@ var SET_AUTO_MERGE_MUTATION = `
     }
   }
 `;
+var OVERRIDE_REQUESTED_CHANGES_MUTATION = `
+  mutation overrideRequestedChanges(
+    $projectPath: ID!
+    $iid: String!
+    $override: Boolean
+  ) {
+    mergeRequestUpdate(
+      input: {
+        projectPath: $projectPath
+        iid: $iid
+        overrideRequestedChanges: $override
+      }
+    ) {
+      mergeRequest {
+        id
+        iid
+        title
+        detailedMergeStatus
+      }
+      errors
+    }
+  }
+`;
 var RESOLVE_DISCUSSION_MUTATION = `
   mutation resolveDiscussion($discussionId: DiscussionID!, $resolve: Boolean!) {
     discussionToggleResolve(input: { id: $discussionId, resolve: $resolve }) {
@@ -29105,7 +29128,7 @@ var RESOLVE_DISCUSSION_MUTATION = `
     }
   }
 `;
-var MergeRequestsClient = class extends GitLabApiClient {
+var MergeRequestsClient = class _MergeRequestsClient extends GitLabApiClient {
   async getMergeRequest(projectId, mrIid, includeChanges) {
     const encodedProject = this.encodeProjectId(projectId);
     let path2 = `/projects/${encodedProject}/merge_requests/${mrIid}`;
@@ -29327,20 +29350,83 @@ var MergeRequestsClient = class extends GitLabApiClient {
    * Set auto-merge (MWPS) on a merge request using GraphQL API
    * Uses the mergeRequestAccept mutation with a merge strategy
    */
-  async setAutoMerge(projectId, mrIid, sha, strategy = "MERGE_WHEN_CHECKS_PASS") {
-    const result = await this.fetchGraphQL(SET_AUTO_MERGE_MUTATION, {
+  async setAutoMerge(projectId, mrIid, sha, strategy = "MERGE_WHEN_CHECKS_PASS", retries = 3) {
+    let lastError = null;
+    for (let attempt = 0; attempt <= retries; attempt++) {
+      const result = await this.fetchGraphQL(SET_AUTO_MERGE_MUTATION, {
+        projectPath: projectId,
+        iid: String(mrIid),
+        sha,
+        strategy
+      });
+      if (result.mergeRequestAccept.errors.length > 0) {
+        const message = result.mergeRequestAccept.errors.join(", ");
+        lastError = new Error(`Failed to set auto-merge: ${message}`);
+        if (attempt < retries && _MergeRequestsClient.isTransientMergeError(message)) {
+          await _MergeRequestsClient.delay(750 * (attempt + 1));
+          continue;
+        }
+        throw lastError;
+      }
+      if (!result.mergeRequestAccept.mergeRequest) {
+        lastError = new Error("Failed to set auto-merge: No merge request returned");
+        if (attempt < retries) {
+          await _MergeRequestsClient.delay(750 * (attempt + 1));
+          continue;
+        }
+        throw lastError;
+      }
+      return result.mergeRequestAccept.mergeRequest;
+    }
+    throw lastError ?? new Error("Failed to set auto-merge: exhausted retries");
+  }
+  /**
+   * True for GitLab merge errors that are transient because mergeability is
+   * still being (re)computed. Such errors clear on their own within a second
+   * or two, so callers should retry rather than treat them as real failures.
+   */
+  static isTransientMergeError(message) {
+    const m = message.toLowerCase();
+    return m.includes("being checked") || m.includes("being recomputed") || m.includes("cannot be merged") || m.includes("not mergeable") || m.includes("merge failed") || m.includes("try again");
+  }
+  /** Small awaitable delay helper (ms). */
+  static delay(ms) {
+    return new Promise((resolve2) => setTimeout(resolve2, ms));
+  }
+  /**
+   * Override (or clear an override of) requested changes on a merge request.
+   *
+   * When a reviewer formally requests changes, the "Change requests must be
+   * approved by the requesting user" merge check blocks the merge. Setting the
+   * persistent `override_requested_changes` flag downgrades that check from a
+   * blocking failure to a non-blocking warning, which is what the "Bypass"
+   * button in the merge request widget does. This is distinct from
+   * `mergeRequestDestroyRequestedChanges`, which only clears the calling user's
+   * own requested-changes review.
+   *
+   * Requires permission to merge to the target branch (otherwise GitLab
+   * silently ignores the flag).
+   *
+   * @param projectId Project ID or URL-encoded path
+   * @param mrIid Internal ID of the merge request
+   * @param override true to bypass requested changes, false to re-enable the block
+   * @returns The updated merge request (id, iid, title, detailedMergeStatus)
+   */
+  async overrideRequestedChanges(projectId, mrIid, override = true) {
+    const result = await this.fetchGraphQL(OVERRIDE_REQUESTED_CHANGES_MUTATION, {
       projectPath: projectId,
       iid: String(mrIid),
-      sha,
-      strategy
+      override
     });
-    if (result.mergeRequestAccept.errors.length > 0) {
-      throw new Error(`Failed to set auto-merge: ${result.mergeRequestAccept.errors.join(", ")}`);
+    if (result.mergeRequestUpdate.errors.length > 0) {
+      throw new Error(
+        `Failed to override requested changes: ${result.mergeRequestUpdate.errors.join(", ")}`
+      );
     }
-    if (!result.mergeRequestAccept.mergeRequest) {
-      throw new Error("Failed to set auto-merge: No merge request returned");
+    if (!result.mergeRequestUpdate.mergeRequest) {
+      throw new Error("Failed to override requested changes: No merge request returned");
     }
-    return result.mergeRequestAccept.mergeRequest;
+    return result.mergeRequestUpdate.mergeRequest;
   }
   /**
    * Approve a merge request
@@ -29388,7 +29474,13 @@ var MergeRequestsClient = class extends GitLabApiClient {
    * Returns detailed context about what happened
    */
   async smartMerge(projectId, mrIid, sha, strategy = "MERGE_WHEN_CHECKS_PASS") {
-    const mr = await this.getMergeRequest(projectId, mrIid);
+    let mr = await this.getMergeRequest(projectId, mrIid);
+    if (mr.detailed_merge_status === "checking") {
+      for (let attempt = 0; attempt < 5 && mr.detailed_merge_status === "checking"; attempt++) {
+        await _MergeRequestsClient.delay(1e3 * (attempt + 1));
+        mr = await this.getMergeRequest(projectId, mrIid);
+      }
+    }
     const context = {
       state: mr.state,
       detailedMergeStatus: mr.detailed_merge_status,
@@ -29427,14 +29519,13 @@ var MergeRequestsClient = class extends GitLabApiClient {
         };
       }
     }
-    const autoMergeStatuses = ["ci_still_running", "not_approved", "checking"];
+    const autoMergeStatuses = ["ci_still_running", "not_approved"];
     if (autoMergeStatuses.includes(mr.detailed_merge_status)) {
       try {
         const result = await this.setAutoMerge(projectId, mrIid, sha, strategy);
         const autoMergeMessages = {
           ci_still_running: "pipeline passes",
-          not_approved: "approved",
-          checking: "checks complete"
+          not_approved: "approved"
         };
         return {
           action: "auto_merge_enabled",
@@ -29793,22 +29884,8 @@ var GET_WORK_ITEM_NOTES_QUERY = `
   }
 `;
 var CREATE_WORK_ITEM_MUTATION = `
-  mutation createWorkItem(
-    $projectPath: ID!
-    $title: String!
-    $workItemTypeId: WorkItemsTypeID!
-    $description: String
-    $labelIds: [LabelID!]
-    $assigneeIds: [UserID!]
-  ) {
-    workItemCreate(input: {
-      projectPath: $projectPath
-      title: $title
-      workItemTypeId: $workItemTypeId
-      descriptionWidget: { description: $description }
-      labelsWidget: { labelIds: $labelIds }
-      assigneesWidget: { assigneeIds: $assigneeIds }
-    }) {
+  mutation createWorkItem($input: WorkItemCreateInput!) {
+    workItemCreate(input: $input) {
       workItem {
         ${WORK_ITEM_FIELDS}
       }
@@ -29817,22 +29894,8 @@ var CREATE_WORK_ITEM_MUTATION = `
   }
 `;
 var UPDATE_WORK_ITEM_MUTATION = `
-  mutation updateWorkItem(
-    $id: WorkItemID!
-    $title: String
-    $description: String
-    $stateEvent: WorkItemStateEvent
-    $labelIds: [LabelID!]
-    $assigneeIds: [UserID!]
-  ) {
-    workItemUpdate(input: {
-      id: $id
-      title: $title
-      descriptionWidget: { description: $description }
-      stateEvent: $stateEvent
-      labelsWidget: { labelIds: $labelIds }
-      assigneesWidget: { assigneeIds: $assigneeIds }
-    }) {
+  mutation updateWorkItem($input: WorkItemUpdateInput!) {
+    workItemUpdate(input: $input) {
       workItem {
         ${WORK_ITEM_FIELDS}
       }
@@ -29926,14 +29989,21 @@ var WorkItemsClient = class extends GitLabApiClient {
   async createWorkItem(projectId, options) {
     const labelIds = options.labels?.map((l) => toGid("Label", l));
     const assigneeIds = options.assignee_ids?.map((id) => toGid("User", id));
-    const result = await this.fetchGraphQL(CREATE_WORK_ITEM_MUTATION, {
+    const input = {
       projectPath: projectId,
       title: options.title,
-      workItemTypeId: toGid("WorkItems::Type", options.work_item_type_id),
-      description: options.description,
-      labelIds: labelIds?.length ? labelIds : void 0,
-      assigneeIds: assigneeIds?.length ? assigneeIds : void 0
-    });
+      workItemTypeId: toGid("WorkItems::Type", options.work_item_type_id)
+    };
+    if (options.description !== void 0) {
+      input.descriptionWidget = { description: options.description };
+    }
+    if (labelIds?.length) {
+      input.labelsWidget = { labelIds };
+    }
+    if (assigneeIds?.length) {
+      input.assigneesWidget = { assigneeIds };
+    }
+    const result = await this.fetchGraphQL(CREATE_WORK_ITEM_MUTATION, { input });
     if (result.workItemCreate.errors.length > 0) {
       throw new Error(`Failed to create work item: ${result.workItemCreate.errors.join(", ")}`);
     }
@@ -29951,14 +30021,23 @@ var WorkItemsClient = class extends GitLabApiClient {
     const stateEvent = options.state_event ? options.state_event === "close" ? "CLOSE" : "REOPEN" : void 0;
     const labelIds = options.labels?.map((l) => toGid("Label", l));
     const assigneeIds = options.assignee_ids?.map((id) => toGid("User", id));
-    const result = await this.fetchGraphQL(UPDATE_WORK_ITEM_MUTATION, {
-      id: gid,
-      title: options.title,
-      description: options.description,
-      stateEvent,
-      labelIds: labelIds?.length ? labelIds : void 0,
-      assigneeIds: assigneeIds?.length ? assigneeIds : void 0
-    });
+    const input = { id: gid };
+    if (options.title !== void 0) {
+      input.title = options.title;
+    }
+    if (options.description !== void 0) {
+      input.descriptionWidget = { description: options.description };
+    }
+    if (stateEvent !== void 0) {
+      input.stateEvent = stateEvent;
+    }
+    if (labelIds?.length) {
+      input.labelsWidget = { addLabelIds: labelIds };
+    }
+    if (assigneeIds?.length) {
+      input.assigneesWidget = { assigneeIds };
+    }
+    const result = await this.fetchGraphQL(UPDATE_WORK_ITEM_MUTATION, { input });
     if (result.workItemUpdate.errors.length > 0) {
       throw new Error(`Failed to update work item: ${result.workItemUpdate.errors.join(", ")}`);
     }
@@ -31736,6 +31815,29 @@ Always provide sha when you want to ensure you're merging the exact code that wa
       return JSON.stringify(result, null, 2);
     }
   }),
+  gitlab_override_requested_changes: tool({
+    description: `Bypass (or re-enable) a "requested changes" merge block on a merge request.
+
+When a reviewer formally requests changes, the merge check "Change requests must be approved by the requesting user" blocks the merge (detailed_merge_status: requested_changes). This tool sets the persistent override_requested_changes flag, which is exactly what the "Bypass" button in the MR widget does: it downgrades that check from a blocking failure to a non-blocking warning so the MR can be merged.
+
+Use this when the requesting reviewer is unavailable (e.g. on PTO) and their concerns have been addressed. The acting user must have permission to merge to the target branch, otherwise GitLab silently ignores the flag.
+
+Note: this is NOT the same as clearing your own requested-changes review. It overrides another user's request. Set override=false to restore the block.`,
+    args: {
+      project_id: z.string().describe("The project ID or URL-encoded path"),
+      mr_iid: z.number().describe("The internal ID of the merge request"),
+      override: z.boolean().optional().describe("true (default) to bypass requested changes, false to restore the block")
+    },
+    execute: async (args, _ctx) => {
+      const client = getGitLabClient();
+      const result = await client.overrideRequestedChanges(
+        args.project_id,
+        args.mr_iid,
+        args.override ?? true
+      );
+      return JSON.stringify(result, null, 2);
+    }
+  }),
   gitlab_approve_merge_request: tool({
     description: `Approve a merge request.
 Adds the current user's approval to the merge request.
@@ -34075,7 +34177,7 @@ async function main() {
     ...auditTools,
     ...awardEmojiTools
   };
-  const version2 = true ? "2.6.0" : "0.0.0";
+  const version2 = true ? "2.7.0" : "0.0.0";
   const server = new McpServer({ name: "gitlab", version: version2 });
   adaptToolsToMcp(server, allTools);
   const transport = new StdioServerTransport();