opencode-gitlab-plugin 2.6.0 → 2.6.1

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.1](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.6.0...v2.6.1) (2026-08-17)
+
+
+### 🐛 Bug Fixes
+
+* **merge-requests:** resolve MWPS 'checking' race in smartMerge/setAutoMerge ([b9a992f](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/b9a992f6ebec655fba271623bf5fc963cfe16f09))
+* **work-items:** avoid nullability mismatch on widget inputs ([1ae3cd7](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/1ae3cd79627c6cca88955f90af13694472939331))
+
 ## [2.6.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.5.0...v2.6.0) (2026-05-20)
 
 

package/dist/index.js

@@ -341,7 +341,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}`;
@@ -563,20 +563,48 @@ 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, {
-      projectPath: projectId,
-      iid: String(mrIid),
-      sha,
-      strategy
-    });
-    if (result.mergeRequestAccept.errors.length > 0) {
-      throw new Error(`Failed to set auto-merge: ${result.mergeRequestAccept.errors.join(", ")}`);
-    }
-    if (!result.mergeRequestAccept.mergeRequest) {
-      throw new Error("Failed to set auto-merge: No merge request returned");
+  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;
     }
-    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));
   }
   /**
    * Approve a merge request
@@ -624,7 +652,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,
@@ -663,14 +697,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",
@@ -1029,22 +1062,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}
       }
@@ -1053,22 +1072,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}
       }
@@ -1162,14 +1167,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(", ")}`);
     }
@@ -1187,14 +1199,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(", ")}`);
     }