opencode-gitlab-plugin 2.8.0 → 2.8.1

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.8.1](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.8.0...v2.8.1) (2026-09-06)
+
+
+### 🐛 Bug Fixes
+
+* **merge-requests:** auto-detect merge train strategy in smart merge ([14fb879](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/14fb879b167ed7ada03b02ef83b0944fbfc00480))
+
 ## [2.8.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.7.0...v2.8.0) (2026-09-06)
 
 

package/dist/index.js

@@ -705,11 +705,48 @@ var MergeRequestsClient = class _MergeRequestsClient extends GitLabApiClient {
       Object.keys(body).length > 0 ? body : void 0
     );
   }
+  /**
+   * Resolve the auto-merge strategy for a project.
+   *
+   * When the caller does not specify a strategy, projects with merge trains
+   * enabled require ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS; otherwise
+   * MERGE_WHEN_CHECKS_PASS is correct. Using the wrong one causes auto-merge to
+   * fail with an opaque "The merge failed" error. Falls back to
+   * MERGE_WHEN_CHECKS_PASS if the project setting cannot be read.
+   *
+   * Returns both the chosen strategy and how it was arrived at, so the caller
+   * can thread a breadcrumb into its result. A bare fallback would collapse a
+   * 401, a network timeout, and a genuine 404 all into a silent MWPS default,
+   * reintroducing the opaque "The merge failed" this behaviour exists to
+   * eliminate; `detection` makes that observable without changing the fallback.
+   */
+  async resolveAutoMergeStrategy(projectId) {
+    try {
+      const encodedProject = this.encodeProjectId(projectId);
+      const project = await this.fetch(
+        "GET",
+        `/projects/${encodedProject}`
+      );
+      return project.merge_trains_enabled ? {
+        strategy: "ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS",
+        detection: "merge_trains_enabled"
+      } : { strategy: "MERGE_WHEN_CHECKS_PASS", detection: "merge_trains_disabled" };
+    } catch (error) {
+      return {
+        strategy: "MERGE_WHEN_CHECKS_PASS",
+        detection: "defaulted_after_error",
+        reason: error instanceof Error ? error.message : String(error)
+      };
+    }
+  }
   /**
    * Smart merge: merge immediately if checks pass, otherwise set auto-merge
-   * Returns detailed context about what happened
+   * Returns detailed context about what happened.
+   *
+   * If `strategy` is omitted, it is auto-detected from the project's merge
+   * train settings (merge-train projects need ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS).
    */
-  async smartMerge(projectId, mrIid, sha, strategy = "MERGE_WHEN_CHECKS_PASS") {
+  async smartMerge(projectId, mrIid, sha, strategy) {
     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++) {
@@ -757,15 +794,24 @@ var MergeRequestsClient = class _MergeRequestsClient extends GitLabApiClient {
     }
     const autoMergeStatuses = ["ci_still_running", "not_approved"];
     if (autoMergeStatuses.includes(mr.detailed_merge_status)) {
+      let resolvedStrategy;
+      if (strategy) {
+        resolvedStrategy = strategy;
+        context.strategyDetection = `explicit: ${strategy}`;
+      } else {
+        const detected = await this.resolveAutoMergeStrategy(projectId);
+        resolvedStrategy = detected.strategy;
+        context.strategyDetection = detected.detection === "defaulted_after_error" ? `failed, defaulted to MERGE_WHEN_CHECKS_PASS${detected.reason ? ` (${detected.reason})` : ""}` : `auto-detected (${detected.detection}): ${detected.strategy}`;
+      }
       try {
-        const result = await this.setAutoMerge(projectId, mrIid, sha, strategy);
+        const result = await this.setAutoMerge(projectId, mrIid, sha, resolvedStrategy);
         const autoMergeMessages = {
           ci_still_running: "pipeline passes",
           not_approved: "approved"
         };
         return {
           action: "auto_merge_enabled",
-          message: `Auto-merge enabled (${strategy}). MR will merge when ${autoMergeMessages[mr.detailed_merge_status]}.`,
+          message: `Auto-merge enabled (${resolvedStrategy}). MR will merge when ${autoMergeMessages[mr.detailed_merge_status]}.`,
           mergeRequest: result,
           context
         };
@@ -3009,17 +3055,12 @@ 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 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."
+        "Auto-merge strategy when immediate merge is not possible. If omitted, it is auto-detected from the project: merge-train projects use ADD_TO_MERGE_TRAIN_WHEN_CHECKS_PASS, otherwise MERGE_WHEN_CHECKS_PASS."
       )
     },
     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"
-      );
+      const result = await client.smartMerge(args.project_id, args.mr_iid, args.sha, args.strategy);
       return JSON.stringify(result, null, 2);
     }
   }),