opencode-gitlab-plugin 2.2.0 → 2.4.0

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.4.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v2.3.0...v2.4.0) (2026-05-19)
+
+
+### ✨ Features
+
+* **orbit:** add GitLab Orbit Knowledge Graph API tools ([17fd452](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/17fd4521ec32f760b26a6596c5d023d7b55eed47))
+
+## [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.d.ts

@@ -20,6 +20,7 @@ import { Plugin } from '@opencode-ai/plugin';
  * - Discussions: unified tools for all resource types (list, get, create/reply, resolve)
  * - Notes: list/get notes (flat view) for MR, issue, epic, snippet
  * - Git: execute safe, read-only git commands in repository
+ * - Orbit: Knowledge Graph API (status, schema, query, neighbors)
  */
 declare const gitlabPlugin: Plugin;
 

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.
@@ -4981,6 +5138,348 @@ Examples:
   })
 };
 
+// src/tools/orbit.ts
+import { tool as tool18 } from "@opencode-ai/plugin";
+var z18 = tool18.schema;
+var orbitTools = {
+  gitlab_orbit_status: tool18({
+    description: `Check GitLab Orbit Knowledge Graph API availability and health.
+
+Returns the status of the Orbit API for the connected GitLab instance.
+Orbit is GitLab's Knowledge Graph API that provides rich SDLC graph data.
+
+Note: Orbit is only available on Premium/Ultimate tiers and requires the feature flag to be enabled.
+If unavailable, returns an error with suggestions for REST API alternatives.`,
+    args: {},
+    execute: async (_args, _ctx) => {
+      const client = getGitLabClient();
+      try {
+        const status = await client.fetch("GET", "/orbit/status");
+        return JSON.stringify(
+          {
+            ...status,
+            available: true,
+            message: "Orbit Knowledge Graph API is available"
+          },
+          null,
+          2
+        );
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (errorMessage.includes("404") || errorMessage.includes("not found")) {
+          return JSON.stringify(
+            {
+              available: false,
+              error: "Orbit API not available",
+              reason: "The Orbit Knowledge Graph API is not enabled on this GitLab instance. Orbit requires GitLab Premium/Ultimate tier and the feature flag to be enabled.",
+              alternatives: [
+                "Use REST API endpoints for MRs, issues, pipelines",
+                "Use GraphQL API for complex queries",
+                "Use gitlab_search for finding related entities"
+              ]
+            },
+            null,
+            2
+          );
+        }
+        if (errorMessage.includes("403") || errorMessage.includes("forbidden")) {
+          return JSON.stringify(
+            {
+              available: false,
+              error: "Orbit API access forbidden",
+              reason: "Your access token does not have permission to use the Orbit API. This may require specific scopes or Premium/Ultimate tier.",
+              alternatives: [
+                "Check token scopes include api or read_api",
+                "Verify your GitLab tier supports Orbit",
+                "Use REST/GraphQL APIs as fallback"
+              ]
+            },
+            null,
+            2
+          );
+        }
+        if (errorMessage.includes("502")) {
+          return JSON.stringify(
+            {
+              available: false,
+              error: "Orbit API temporarily unavailable",
+              reason: "The Orbit API returned a 502 error. This may be temporary.",
+              suggestion: "Try again later or use REST/GraphQL APIs as fallback."
+            },
+            null,
+            2
+          );
+        }
+        return JSON.stringify(
+          {
+            available: false,
+            error: "Orbit API error",
+            message: errorMessage,
+            alternatives: ["Use REST/GraphQL APIs as fallback"]
+          },
+          null,
+          2
+        );
+      }
+    }
+  }),
+  gitlab_orbit_schema: tool18({
+    description: `Get the Orbit Knowledge Graph schema.
+
+Returns the available node types, relationship types, and their properties.
+Use this to understand what entities and relationships can be queried.
+
+Node type domains include:
+- Core: Project, Group, User
+- Source Code: File, Definition, Commit
+- Code Review: MergeRequest, Diff, Review
+- CI/CD: Pipeline, Job, Deployment
+- Planning: WorkItem (issues, epics, tasks)
+- Security: Vulnerability
+
+Note: Requires Orbit API to be available (Premium/Ultimate tier).`,
+    args: {},
+    execute: async (_args, _ctx) => {
+      const client = getGitLabClient();
+      try {
+        const schema = await client.fetch("GET", "/orbit/schema");
+        return JSON.stringify(schema, null, 2);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (errorMessage.includes("404") || errorMessage.includes("not found")) {
+          return JSON.stringify(
+            {
+              error: "Orbit API not available",
+              suggestion: "Use gitlab_orbit_status to check API availability"
+            },
+            null,
+            2
+          );
+        }
+        if (errorMessage.includes("502")) {
+          return JSON.stringify(
+            {
+              error: "Orbit API temporarily unavailable",
+              suggestion: "The Orbit API returned a 502 error. This may be temporary - try again later."
+            },
+            null,
+            2
+          );
+        }
+        throw error;
+      }
+    }
+  }),
+  gitlab_orbit_query: tool18({
+    description: `Execute a query against the Orbit Knowledge Graph.
+
+Query types:
+- traversal: Walk the graph from a starting node
+- neighbors: Get immediate neighbors of a node
+
+IMPORTANT: The query format uses variable names for node references.
+- "id" in node definition is a VARIABLE NAME (alias), not the actual entity ID
+- Actual IDs go in "filters" with {"field": {"op": "eq", "value": X}} format
+
+Example neighbors query to get a project's connections:
+{
+  "query_type": "neighbors",
+  "node": {
+    "entity": "Project",
+    "id": "p",
+    "filters": {"id": {"op": "eq", "value": 278964}}
+  },
+  "neighbors": {"node": "p", "direction": "incoming"},
+  "aggregations": [],
+  "path": {"type": "shortest", "from": "p", "to": "p", "max_depth": 1}
+}
+
+Example traversal query:
+{
+  "query_type": "traversal",
+  "node": {
+    "entity": "MergeRequest",
+    "id": "mr",
+    "filters": {"id": {"op": "eq", "value": 377844873}}
+  },
+  "neighbors": {"node": "mr", "direction": "both"},
+  "aggregations": [],
+  "path": {"type": "shortest", "from": "mr", "to": "mr", "max_depth": 1}
+}
+
+Note: Use gitlab_get_merge_request to get the internal ID from an IID.
+Returns nodes array and edges array with relationship types.`,
+    args: {
+      // Using a JSON string rather than a structured zod schema because the Orbit query
+      // format is still evolving. This allows flexibility as the API changes without
+      // requiring schema updates for each iteration.
+      query: z18.string().describe(
+        "JSON string containing the full query object. Must include query_type, node, neighbors, aggregations, and path fields. See description for format details."
+      ),
+      limit: z18.number().optional().describe("Maximum number of results (default: 30)")
+    },
+    execute: async (args, _ctx) => {
+      const client = getGitLabClient();
+      let queryObj;
+      try {
+        queryObj = JSON.parse(args.query);
+      } catch {
+        return JSON.stringify(
+          {
+            error: "Invalid JSON in query parameter",
+            suggestion: "Ensure the query parameter is valid JSON"
+          },
+          null,
+          2
+        );
+      }
+      const requestBody = {
+        query: queryObj
+      };
+      if (args.limit) {
+        requestBody.limit = args.limit;
+      }
+      try {
+        const result = await client.fetch("POST", "/orbit/query", requestBody);
+        if (result.code) {
+          return JSON.stringify(
+            {
+              error: "Query compilation error",
+              code: result.code,
+              message: result.message,
+              suggestion: 'Check query structure. Node "id" is a variable name, actual IDs go in filters.'
+            },
+            null,
+            2
+          );
+        }
+        return JSON.stringify(result, null, 2);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (errorMessage.includes("404") || errorMessage.includes("not found")) {
+          return JSON.stringify(
+            {
+              error: "Orbit API not available",
+              suggestion: "Use gitlab_orbit_status to check API availability"
+            },
+            null,
+            2
+          );
+        }
+        if (errorMessage.includes("502")) {
+          return JSON.stringify(
+            {
+              error: "Orbit query failed",
+              message: "The Orbit API returned a 502 error. This is a known issue with some entity types (e.g., source_code domain).",
+              suggestion: "Try a different entity type or use REST/GraphQL APIs as fallback."
+            },
+            null,
+            2
+          );
+        }
+        throw error;
+      }
+    }
+  }),
+  gitlab_orbit_neighbors: tool18({
+    description: `Get immediate neighbors of a node in the Orbit Knowledge Graph.
+
+This is a simplified wrapper that builds the query for you.
+Returns nodes directly connected to the specified node.
+
+Common use cases:
+- Get all connections to a project (users, groups, pipelines, MRs)
+- Get pipelines for an MR
+- Get files changed in a commit
+- Get deployments from a pipeline
+
+Note: Use GitLab internal numeric IDs (not IIDs).
+Example: For MR !123 in gitlab-org/gitlab, first get the internal ID via gitlab_get_merge_request,
+then use that ID (e.g., 377844873).`,
+    args: {
+      entity_type: z18.string().describe(
+        "Type of the entity (e.g., Project, MergeRequest, User, Pipeline, Commit, WorkItem, Group)"
+      ),
+      entity_id: z18.number().describe(
+        "GitLab internal numeric ID (not IID). Get this from REST/GraphQL API responses."
+      ),
+      direction: z18.enum(["incoming", "outgoing", "both"]).optional().describe("Direction of relationships to traverse (default: both)"),
+      limit: z18.number().optional().describe("Maximum number of neighbors to return (default: 30)")
+    },
+    execute: async (args, _ctx) => {
+      const client = getGitLabClient();
+      const direction = args.direction || "both";
+      const queryObj = {
+        query_type: "neighbors",
+        node: {
+          entity: args.entity_type,
+          id: "n",
+          filters: {
+            id: { op: "eq", value: args.entity_id }
+          }
+        },
+        neighbors: {
+          node: "n",
+          direction
+        },
+        aggregations: [],
+        path: { type: "shortest", from: "n", to: "n", max_depth: 1 }
+      };
+      const requestBody = {
+        query: queryObj
+      };
+      if (args.limit) {
+        requestBody.limit = args.limit;
+      }
+      try {
+        const result = await client.fetch("POST", "/orbit/query", requestBody);
+        if (result.code) {
+          return JSON.stringify(
+            {
+              error: "Query error",
+              code: result.code,
+              message: result.message,
+              entity_type: args.entity_type,
+              entity_id: args.entity_id
+            },
+            null,
+            2
+          );
+        }
+        return JSON.stringify(result, null, 2);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (errorMessage.includes("404") || errorMessage.includes("not found")) {
+          return JSON.stringify(
+            {
+              error: "Orbit API not available",
+              entity_type: args.entity_type,
+              entity_id: args.entity_id,
+              suggestion: "Use gitlab_orbit_status to check API availability"
+            },
+            null,
+            2
+          );
+        }
+        if (errorMessage.includes("502")) {
+          return JSON.stringify(
+            {
+              error: "Orbit query failed",
+              entity_type: args.entity_type,
+              entity_id: args.entity_id,
+              message: "The Orbit API returned a 502 error. This is a known issue with some entity types.",
+              suggestion: "Try a different entity type or use REST/GraphQL APIs as fallback."
+            },
+            null,
+            2
+          );
+        }
+        throw error;
+      }
+    }
+  })
+};
+
 // src/index.ts
 var gitlabPlugin = async (_input, options) => {
   if (options?.tools === false) {
@@ -5012,7 +5511,8 @@ DAP tools (agents, flows, memory, skills) are on the "gitlab-dap" server instead
       ...notesUnifiedTools,
       ...gitTools,
       ...auditTools,
-      ...awardEmojiTools
+      ...awardEmojiTools,
+      ...orbitTools
     }
   };
 };