opencode-gitlab-plugin 2.5.0 → 2.6.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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)
+
+
+### ✨ Features
+
+* **pagination:** expose pagination info in list MR and issue responses ([1c1722e](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/1c1722e62e0e41f00ab5409057bea1e76ec17a8d))
+
+
+### ♻️ Code Refactoring
+
+* **client:** address review feedback on !23 ([2e94e46](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/2e94e46706807bc8797f10884f71fc56ecf967b9)), closes [23#note_3135645102](https://gitlab.com/vglafirov/23/issues/note_3135645102) [23#note_3135645423](https://gitlab.com/vglafirov/23/issues/note_3135645423) [23#note_3135644923](https://gitlab.com/vglafirov/23/issues/note_3135644923)
+
 ## [2.5.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.4.0...v2.5.0) (2026-05-20)
 
 

package/dist/index.js

@@ -26,7 +26,13 @@ var GitLabApiClient = class {
     }
     return projectId;
   }
-  async fetch(method, path2, body) {
+  /**
+   * Core HTTP request used by all REST helpers.
+   *
+   * Returns the raw `Response` after validating the status code so callers can
+   * inspect headers (e.g. for pagination) before parsing the body.
+   */
+  async rawFetch(method, path2, body) {
     const url = `${this.instanceUrl}/api/v4${path2}`;
     const response = await fetch(url, {
       method,
@@ -37,12 +43,53 @@ var GitLabApiClient = class {
       const errorText = await response.text();
       throw new Error(`GitLab API error ${response.status}: ${errorText}`);
     }
+    return response;
+  }
+  async fetch(method, path2, body) {
+    const response = await this.rawFetch(method, path2, body);
     const text = await response.text();
     if (!text) {
       return {};
     }
     return JSON.parse(text);
   }
+  /**
+   * Parse a numeric pagination header, guarding against empty strings.
+   *
+   * GitLab returns `""` (rather than omitting the header) for `X-Next-Page` and
+   * `X-Prev-Page` when there is no next/prev page, and bare `parseInt` without
+   * a radix on an empty string yields `NaN`. Treat empty/missing as `undefined`.
+   */
+  parsePaginationHeader(response, name) {
+    const raw = response.headers.get(name);
+    if (raw == null || raw === "") return void 0;
+    const value = parseInt(raw, 10);
+    return Number.isNaN(value) ? void 0 : value;
+  }
+  /**
+   * Pagination info extracted from GitLab API response headers
+   */
+  extractPaginationInfo(response) {
+    return {
+      total: this.parsePaginationHeader(response, "X-Total"),
+      totalPages: this.parsePaginationHeader(response, "X-Total-Pages"),
+      page: this.parsePaginationHeader(response, "X-Page"),
+      perPage: this.parsePaginationHeader(response, "X-Per-Page"),
+      nextPage: this.parsePaginationHeader(response, "X-Next-Page"),
+      prevPage: this.parsePaginationHeader(response, "X-Prev-Page")
+    };
+  }
+  /**
+   * Fetch with pagination info from response headers.
+   * Use this for list endpoints where knowing if more data exists is important.
+   */
+  async fetchWithPagination(method, path2, body) {
+    const response = await this.rawFetch(method, path2, body);
+    const text = await response.text();
+    const data = text ? JSON.parse(text) : [];
+    const pagination = this.extractPaginationInfo(response);
+    return { data, pagination };
+  }
   async fetchText(method, path2) {
     const url = `${this.instanceUrl}/api/v4${path2}`;
     const response = await fetch(url, {
@@ -294,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}`;
@@ -306,6 +353,7 @@ var MergeRequestsClient = class extends GitLabApiClient {
   async listMergeRequests(options) {
     const params = new URLSearchParams();
     params.set("per_page", String(options.limit || 20));
+    if (options.page) params.set("page", String(options.page));
     if (options.state) params.set("state", options.state);
     if (options.scope) params.set("scope", options.scope);
     if (options.search) params.set("search", options.search);
@@ -317,7 +365,7 @@ var MergeRequestsClient = class extends GitLabApiClient {
     } else {
       path2 = `/merge_requests?${params}`;
     }
-    return this.fetch("GET", path2);
+    return this.fetchWithPagination("GET", path2);
   }
   async getMrChanges(projectId, mrIid) {
     const encodedProject = this.encodeProjectId(projectId);
@@ -515,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
@@ -576,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,
@@ -615,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",
@@ -729,6 +810,7 @@ var IssuesClient = class extends GitLabApiClient {
   async listIssues(options) {
     const params = new URLSearchParams();
     params.set("per_page", String(options.limit || 20));
+    if (options.page) params.set("page", String(options.page));
     if (options.state) params.set("state", options.state);
     if (options.scope) params.set("scope", options.scope);
     if (options.search) params.set("search", options.search);
@@ -741,7 +823,7 @@ var IssuesClient = class extends GitLabApiClient {
     } else {
       path2 = `/issues?${params}`;
     }
-    return this.fetch("GET", path2);
+    return this.fetchWithPagination("GET", path2);
   }
   /**
    * List notes on an issue using GraphQL API with pagination support
@@ -980,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}
       }
@@ -1004,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}
       }
@@ -1113,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(", ")}`);
     }
@@ -1138,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(", ")}`);
     }
@@ -2647,26 +2717,31 @@ Returns: title, description, state, author, assignees, reviewers, labels, diff s
   }),
   gitlab_list_merge_requests: tool({
     description: `List merge requests for a project or search globally.
-Can filter by state (opened, closed, merged, all), scope (assigned_to_me, created_by_me), and labels.`,
+Can filter by state (opened, closed, merged, all), scope (assigned_to_me, created_by_me), and labels.
+
+IMPORTANT: Response includes pagination info. If nextPage exists, there are more results.
+Always paginate until you get an empty response or no nextPage to ensure you have all data.`,
     args: {
       project_id: z.string().optional().describe("The project ID or path. If not provided, searches globally."),
       state: z.enum(["opened", "closed", "merged", "all"]).optional().describe("Filter by MR state (default: opened)"),
       scope: z.enum(["assigned_to_me", "created_by_me", "all"]).optional().describe("Filter by scope"),
       search: z.string().optional().describe("Search MRs by title or description"),
       labels: z.string().optional().describe("Comma-separated list of labels to filter by"),
-      limit: z.number().optional().describe("Maximum number of results (default: 20)")
+      limit: z.number().optional().describe("Maximum number of results per page (default: 20)"),
+      page: z.number().optional().describe("Page number for pagination (default: 1)")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
-      const mrs = await client.listMergeRequests({
+      const result = await client.listMergeRequests({
         projectId: args.project_id,
         state: args.state,
         scope: args.scope,
         search: args.search,
         labels: args.labels,
-        limit: args.limit
+        limit: args.limit,
+        page: args.page
       });
-      return JSON.stringify(mrs, null, 2);
+      return JSON.stringify(result, null, 2);
     }
   }),
   gitlab_get_mr_changes: tool({
@@ -2998,7 +3073,10 @@ Returns: title, description, state, author, assignees, labels, milestone, weight
   }),
   gitlab_list_issues: tool2({
     description: `List issues for a project or search globally.
-Can filter by state, labels, assignee, milestone.`,
+Can filter by state, labels, assignee, milestone.
+
+IMPORTANT: Response includes pagination info. If nextPage exists, there are more results.
+Always paginate until you get an empty response or no nextPage to ensure you have all data.`,
     args: {
       project_id: z2.string().optional().describe("The project ID or path. If not provided, searches globally."),
       state: z2.enum(["opened", "closed", "all"]).optional().describe("Filter by issue state (default: opened)"),
@@ -3006,20 +3084,22 @@ Can filter by state, labels, assignee, milestone.`,
       search: z2.string().optional().describe("Search issues by title or description"),
       labels: z2.string().optional().describe("Comma-separated list of labels to filter by"),
       milestone: z2.string().optional().describe("Filter by milestone title"),
-      limit: z2.number().optional().describe("Maximum number of results (default: 20)")
+      limit: z2.number().optional().describe("Maximum number of results per page (default: 20)"),
+      page: z2.number().optional().describe("Page number for pagination (default: 1)")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
-      const issues = await client.listIssues({
+      const result = await client.listIssues({
         projectId: args.project_id,
         state: args.state,
         scope: args.scope,
         search: args.search,
         labels: args.labels,
         milestone: args.milestone,
-        limit: args.limit
+        limit: args.limit,
+        page: args.page
       });
-      return JSON.stringify(issues, null, 2);
+      return JSON.stringify(result, null, 2);
     }
   })
 };