opencode-gitlab-plugin 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.2.0...v2.3.0) (2026-05-18)
+
+
+### ✨ Features
+
+* **merge-requests:** add smart merge with detailed context ([d03da5d](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/d03da5d19d3851e1d3a59a07dd3155d307a0369c))
+
 ## [2.2.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.1.0...v2.2.0) (2026-04-07)
 
 

package/dist/index.js

@@ -545,6 +545,107 @@ var MergeRequestsClient = class extends GitLabApiClient {
       `/projects/${encodedProject}/merge_requests/${mrIid}/unapprove`
     );
   }
+  /**
+   * Merge a merge request immediately
+   * Requires the MR to be in a mergeable state (approved, pipeline passed, no conflicts)
+   */
+  async mergeMergeRequest(projectId, mrIid, options) {
+    const encodedProject = this.encodeProjectId(projectId);
+    const body = {};
+    if (options?.sha) body.sha = options.sha;
+    if (options?.squash !== void 0) body.squash = options.squash;
+    if (options?.shouldRemoveSourceBranch !== void 0) {
+      body.should_remove_source_branch = options.shouldRemoveSourceBranch;
+    }
+    return this.fetch(
+      "PUT",
+      `/projects/${encodedProject}/merge_requests/${mrIid}/merge`,
+      Object.keys(body).length > 0 ? body : void 0
+    );
+  }
+  /**
+   * Smart merge: merge immediately if checks pass, otherwise set auto-merge
+   * Returns detailed context about what happened
+   */
+  async smartMerge(projectId, mrIid, sha, strategy = "MERGE_WHEN_CHECKS_PASS") {
+    const mr = await this.getMergeRequest(projectId, mrIid);
+    const context = {
+      state: mr.state,
+      detailedMergeStatus: mr.detailed_merge_status,
+      pipelineStatus: mr.head_pipeline?.status || null,
+      hasConflicts: mr.has_conflicts,
+      hasAnyApproval: (mr.approved_by?.length || 0) > 0
+    };
+    if (mr.state !== "opened") {
+      return {
+        action: "failed",
+        message: `MR is not open (state: ${mr.state})`,
+        context
+      };
+    }
+    if (mr.has_conflicts) {
+      return {
+        action: "failed",
+        message: "MR has merge conflicts that must be resolved",
+        context
+      };
+    }
+    if (mr.detailed_merge_status === "mergeable") {
+      try {
+        const result = await this.mergeMergeRequest(projectId, mrIid, { sha: mr.sha });
+        return {
+          action: "merged",
+          message: "MR merged successfully",
+          mergeRequest: result,
+          context
+        };
+      } catch (error) {
+        return {
+          action: "failed",
+          message: `Direct merge failed: ${error instanceof Error ? error.message : String(error)}`,
+          context
+        };
+      }
+    }
+    const autoMergeStatuses = ["ci_still_running", "not_approved", "checking"];
+    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"
+        };
+        return {
+          action: "auto_merge_enabled",
+          message: `Auto-merge enabled (${strategy}). MR will merge when ${autoMergeMessages[mr.detailed_merge_status]}.`,
+          mergeRequest: result,
+          context
+        };
+      } catch (error) {
+        return {
+          action: "failed",
+          message: `Failed to enable auto-merge: ${error instanceof Error ? error.message : String(error)}. MR status: ${mr.detailed_merge_status}, pipeline: ${mr.head_pipeline?.status || "none"}`,
+          context
+        };
+      }
+    }
+    const statusHints = {
+      discussions_not_resolved: "Resolve all open discussion threads before merging.",
+      draft_status: "MR is in draft. Mark as ready before merging.",
+      need_rebase: "Source branch needs to be rebased onto the target branch.",
+      requested_changes: "A reviewer requested changes that must be addressed.",
+      policies_denied: "Merge is blocked by a security/compliance policy.",
+      external_status_checks: "External status checks must pass before merging.",
+      jira_association_missing: "MR must be linked to a Jira issue.",
+      conflict: "MR has merge conflicts that must be resolved."
+    };
+    return {
+      action: "failed",
+      message: statusHints[mr.detailed_merge_status] ?? `Cannot merge: ${mr.detailed_merge_status}`,
+      context
+    };
+  }
 };
 
 // src/client/issues.ts
@@ -2709,7 +2810,7 @@ Note: You must provide the current HEAD SHA of the MR to prevent race conditions
         "The HEAD SHA of the merge request. Get this from the MR details (diff_refs.head_sha or sha field)."
       ),
       strategy: z.enum(["MERGE_WHEN_CHECKS_PASS", "ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS"]).optional().describe(
-        "Auto-merge strategy. MERGE_WHEN_CHECKS_PASS (default) waits for all checks including approvals. ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS adds to merge train when checks pass."
+        "MERGE_WHEN_CHECKS_PASS (default) waits for all checks. ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS adds to merge train."
       )
     },
     execute: async (args, _ctx) => {
@@ -2723,6 +2824,62 @@ Note: You must provide the current HEAD SHA of the MR to prevent race conditions
       return JSON.stringify(result, null, 2);
     }
   }),
+  gitlab_smart_merge_mr: tool({
+    description: `Smart merge: merges immediately if checks pass, otherwise enables auto-merge (MWPS).
+This tool automatically determines the best merge action based on MR state:
+- If MR is mergeable (pipeline passed, approved): merges immediately
+- If pipeline is running or awaiting approval: enables auto-merge
+- Returns detailed context about what happened and why
+
+Provides actionable feedback on failures including MR state, pipeline status, and remediation hints.
+Note: You must provide the current HEAD SHA of the MR to prevent race conditions.`,
+    args: {
+      project_id: z.string().describe('The project ID or path (e.g., "gitlab-org/gitlab")'),
+      mr_iid: z.number().describe("The internal ID of the merge request"),
+      sha: z.string().describe(
+        "The HEAD SHA of the merge request. Get this from the MR details (diff_refs.head_sha or sha field)."
+      ),
+      strategy: z.enum(["MERGE_WHEN_CHECKS_PASS", "ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS"]).optional().describe(
+        "Auto-merge strategy when immediate merge is not possible. MERGE_WHEN_CHECKS_PASS (default) waits for all checks. ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS adds to merge train."
+      )
+    },
+    execute: async (args, _ctx) => {
+      const client = getGitLabClient();
+      const result = await client.smartMerge(
+        args.project_id,
+        args.mr_iid,
+        args.sha,
+        args.strategy || "MERGE_WHEN_CHECKS_PASS"
+      );
+      return JSON.stringify(result, null, 2);
+    }
+  }),
+  gitlab_merge_mr: tool({
+    description: `Merge a merge request immediately.
+Use this when you know the MR is ready to merge (pipeline passed, approved, no conflicts).
+For automatic handling based on MR state, use gitlab_smart_merge_mr instead.
+
+WARNING: If sha is omitted, the merge may succeed against a newer commit than what was reviewed/approved.
+Always provide sha when you want to ensure you're merging the exact code that was reviewed.`,
+    args: {
+      project_id: z.string().describe('The project ID or path (e.g., "gitlab-org/gitlab")'),
+      mr_iid: z.number().describe("The internal ID of the merge request"),
+      sha: z.string().optional().describe(
+        "HEAD SHA to verify before merging. Recommended to prevent merging unreviewed code if new commits were pushed."
+      ),
+      squash: z.boolean().optional().describe("Whether to squash commits (uses project default if not specified)"),
+      should_remove_source_branch: z.boolean().optional().describe("Whether to delete source branch after merge")
+    },
+    execute: async (args, _ctx) => {
+      const client = getGitLabClient();
+      const result = await client.mergeMergeRequest(args.project_id, args.mr_iid, {
+        sha: args.sha,
+        squash: args.squash,
+        shouldRemoveSourceBranch: args.should_remove_source_branch
+      });
+      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.