opencode-gitlab-plugin 2.8.0 → 2.8.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.8.2](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.8.1...v2.8.2) (2026-09-18)
+
+
+### 🐛 Bug Fixes
+
+* **tools:** validate generated GitLab arguments ([69fcfd5](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/69fcfd56c8086f600277da8176a9e5c09b0e8ac5))
+
+## [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/README.md

@@ -389,15 +389,15 @@ The plugin provides **64 tools** organized into the following categories:
 
 ### Repository Tools (7 tools)
 
-| Tool                          | Description                                            |
-| ----------------------------- | ------------------------------------------------------ |
-| `gitlab_get_file`             | Get file contents from any branch, tag, or commit      |
-| `gitlab_get_commit`           | Get commit details with metadata, author, and stats    |
-| `gitlab_list_commits`         | List commits with filtering by branch, path, and dates |
-| `gitlab_get_commit_diff`      | Get diff for a specific commit                         |
-| `gitlab_list_repository_tree` | List files and directories at a given path             |
-| `gitlab_list_branches`        | List all branches in a repository                      |
-| `gitlab_get_commit_comments`  | Get all commit comments in flat structure              |
+| Tool                          | Description                                                   |
+| ----------------------------- | ------------------------------------------------------------- |
+| `gitlab_get_file`             | Get file contents from an explicit branch, tag, or commit ref |
+| `gitlab_get_commit`           | Get commit details with metadata, author, and stats           |
+| `gitlab_list_commits`         | List commits with filtering by branch, path, and dates        |
+| `gitlab_get_commit_diff`      | Get diff for a specific commit                                |
+| `gitlab_list_repository_tree` | List files and directories at a given path                    |
+| `gitlab_list_branches`        | List all branches in a repository                             |
+| `gitlab_get_commit_comments`  | Get all commit comments in flat structure                     |
 
 ### Search Tools (2 tools)
 

package/dist/index.js

@@ -129,19 +129,45 @@ var GitLabApiClient = class {
   }
 };
 
-// src/client/notes-types.ts
-function buildPaginationVariables(options) {
+// src/client/connection-pagination.ts
+var DEFAULT_PAGE_SIZE = 20;
+var MAX_PAGE_SIZE = 100;
+function normalizePageSize(value) {
+  if (value === void 0 || value === 0) return void 0;
+  if (!Number.isFinite(value)) return DEFAULT_PAGE_SIZE;
+  return Math.min(Math.max(Math.floor(value), 1), MAX_PAGE_SIZE);
+}
+function buildConnectionVariables(options) {
   const variables = {};
-  if (options?.first !== void 0) {
-    variables.first = options.first;
-  } else if (options?.last == null) {
-    variables.first = 20;
+  const first = normalizePageSize(options?.first);
+  const last = normalizePageSize(options?.last);
+  if (first !== void 0 && last !== void 0) {
+    throw new Error("Pagination accepts either 'first' or 'last', not both");
+  }
+  if (options?.after && last !== void 0) {
+    throw new Error("Pagination cursor 'after' cannot be combined with 'last'");
+  }
+  if (options?.before && first !== void 0) {
+    throw new Error("Pagination cursor 'before' cannot be combined with 'first'");
+  }
+  if (first !== void 0) {
+    variables.first = first;
+  } else if (last !== void 0) {
+    variables.last = last;
+  } else if (options?.before) {
+    variables.last = DEFAULT_PAGE_SIZE;
+  } else {
+    variables.first = DEFAULT_PAGE_SIZE;
   }
   if (options?.after) variables.after = options.after;
-  if (options?.last !== void 0) variables.last = options.last;
   if (options?.before) variables.before = options.before;
   return variables;
 }
+
+// src/client/notes-types.ts
+function buildPaginationVariables(options) {
+  return buildConnectionVariables(options);
+}
 var NOTES_FRAGMENT = `
   fragment NoteFields on Note {
     id
@@ -180,16 +206,7 @@ var NOTES_CONNECTION_FRAGMENT = `
 
 // src/client/discussions-types.ts
 function buildDiscussionsPaginationVariables(options) {
-  const variables = {};
-  if (options?.first !== void 0) {
-    variables.first = options.first;
-  } else if (options?.last == null) {
-    variables.first = 20;
-  }
-  if (options?.after) variables.after = options.after;
-  if (options?.last !== void 0) variables.last = options.last;
-  if (options?.before) variables.before = options.before;
-  return variables;
+  return buildConnectionVariables(options);
 }
 var DISCUSSION_NOTE_FRAGMENT = `
   fragment DiscussionNoteFields on Note {
@@ -705,11 +722,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 +811,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
         };
@@ -1403,10 +1466,7 @@ var RepositoryClient = class extends GitLabApiClient {
   async getFile(projectId, filePath, ref) {
     const encodedProject = this.encodeProjectId(projectId);
     const encodedPath = encodeURIComponent(filePath);
-    let url = `/projects/${encodedProject}/repository/files/${encodedPath}`;
-    if (ref) {
-      url += `?ref=${encodeURIComponent(ref)}`;
-    }
+    const url = `/projects/${encodedProject}/repository/files/${encodedPath}?ref=${encodeURIComponent(ref)}`;
     const file = await this.fetch("GET", url);
     if (file.encoding === "base64") {
       return Buffer.from(file.content, "base64").toString("utf-8");
@@ -3009,17 +3069,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);
     }
   }),
@@ -3505,13 +3560,13 @@ var repositoryTools = {
   gitlab_get_file: tool5({
     description: `Get the contents of a file from a repository.
 Supports fetching files from any branch, tag, or commit SHA.
-If ref is not specified, uses the project's default branch.
+An explicit ref is required by the GitLab repository files API.
 Note: Invalid refs will result in a 404 error from the GitLab API.`,
     args: {
       project_id: z5.string().describe("The project ID or URL-encoded path"),
       file_path: z5.string().describe("Path to the file in the repository"),
-      ref: z5.string().optional().describe(
-        `Branch name, tag, or commit SHA to fetch the file from. Supports full or short commit SHAs. If omitted, uses the project's default branch (e.g., "main" or "master").`
+      ref: z5.string().trim().min(1).describe(
+        "Branch name, tag, or commit SHA to fetch the file from. Supports full or short commit SHAs."
       )
     },
     execute: async (args, _ctx) => {
@@ -3689,6 +3744,8 @@ Scopes and their requirements:
 - wiki_blobs: Search wiki content (supports ref filter)
 - group_projects: Search projects within a group (requires group_id)
 
+For scopes other than milestones, state="all" is treated as omitted because it does not filter results.
+
 Examples:
 - Issues: scope="issues", search="bug", project_id="my-group/my-project"
 - Code: scope="blobs", search="function calculateTotal"
@@ -3723,6 +3780,9 @@ Examples:
       state: z6.enum(["active", "closed", "all"]).optional().describe("Filter by state (for milestones scope)")
     },
     execute: async (args, _ctx) => {
+      if (args.scope !== "milestones" && args.state === "all") {
+        args.state = void 0;
+      }
       validateSearchParams(args.scope, {
         project_id: args.project_id,
         group_id: args.group_id,
@@ -4431,10 +4491,10 @@ Examples:
         "Filter by resolved status: true for resolved, false for unresolved. Only returns resolvable discussions (excludes system notes). Client-side filtering."
       ),
       // Pagination
-      first: z13.number().optional().describe("Number of items to return (default: 20)"),
+      first: z13.number().int().min(0).max(100).optional().describe("Number of items to return (default: 20, max: 100; 0 uses the default)"),
       after: z13.string().optional().describe("Cursor for pagination - use endCursor from previous response"),
       before: z13.string().optional().describe("Cursor for backward pagination"),
-      last: z13.number().optional().describe("Number of items from the end")
+      last: z13.number().int().min(0).max(100).optional().describe("Number of items from the end (max: 100; 0 is omitted)")
     },
     execute: async (args, _ctx) => {
       validateResourceParams(args.resource_type, args);
@@ -4747,9 +4807,11 @@ Examples:
         "Filter by resolved status: true for resolved, false for unresolved. Only returns resolvable notes (excludes system notes). Client-side filtering."
       ),
       // Pagination
-      first: z14.number().optional().describe("Number of items to return from the beginning (default: 20, max: 100)"),
+      first: z14.number().int().min(0).max(100).optional().describe(
+        "Number of items to return from the beginning (default: 20, max: 100; 0 uses the default)"
+      ),
       after: z14.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
-      last: z14.number().optional().describe("Number of items to return from the end (for backward pagination)"),
+      last: z14.number().int().min(0).max(100).optional().describe("Number of items to return from the end (max: 100; 0 is omitted)"),
       before: z14.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
     },
     execute: async (args, _ctx) => {