@gitlab/opencode-gitlab-plugin 1.5.2 → 1.5.4

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.
 
+## [1.5.4](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/compare/v1.5.3...v1.5.4) (2026-02-03)
+
+
+### 📚 Documentation
+
+* update README for unified discussion tools consolidation ([a832573](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/commit/a832573159b157c0cfe806ab1f12047325e14c56))
+
+## [1.5.3](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/compare/v1.5.2...v1.5.3) (2026-02-03)
+
+
+### 🐛 Bug Fixes
+
+* use null checks for stricter validation ([6c39c81](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/commit/6c39c81aa839a99a0c12b3aa57d9376e5e3788d4))
+
+
+### ♻️ Code Refactoring
+
+* consolidate discussion tools into unified interface ([aa0cefd](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/commit/aa0cefdcc36fbd00c375ca17b0d75dbda3ecbe18))
+* remove gitlab_create_commit tool ([4c4944d](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/commit/4c4944d8afcd710e7b0910d82197802eee75e6fd))
+
 ## [1.5.2](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/compare/v1.5.1...v1.5.2) (2026-02-02)
 
 

package/README.md

@@ -53,19 +53,19 @@ A comprehensive GitLab API plugin for OpenCode that provides AI-powered access t
 - **Rate Limiting**: Built-in handling for GitLab API rate limits
 - **Caching**: Efficient API response handling
 - **Modular Architecture**: Clean separation of concerns with client and tool modules
-- **Comprehensive Testing**: 181 tests with full coverage of all features
+- **Comprehensive Testing**: 180 tests with full coverage of all features
 
 ### GraphQL-Powered Tools
 
 The following tools use GitLab's GraphQL API for enhanced functionality:
 
-| Category        | Tools                                                                                                                            | Benefits                                                 |
-| --------------- | -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
-| **TODOs**       | `gitlab_list_todos`, `gitlab_get_todo_count`                                                                                     | Cursor-based pagination, rich filtering                  |
-| **Notes**       | `gitlab_list_mr_notes`, `gitlab_list_issue_notes`, `gitlab_list_epic_notes`, `gitlab_list_snippet_notes`                         | Efficient pagination, consistent response format         |
-| **Discussions** | `gitlab_list_mr_discussions`, `gitlab_list_issue_discussions`, `gitlab_list_epic_discussions`, `gitlab_list_snippet_discussions` | Cursor-based pagination, nested note support             |
-| **Auto-merge**  | `gitlab_set_mr_auto_merge`                                                                                                       | MWPS (Merge When Pipeline Succeeds), merge train support |
-| **Security**    | All vulnerability management tools                                                                                               | Type-safe GID validation, mutation support               |
+| Category        | Tools                                                                                                       | Benefits                                                                                 |
+| --------------- | ----------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
+| **TODOs**       | `gitlab_list_todos`, `gitlab_get_todo_count`                                                                | Cursor-based pagination, rich filtering                                                  |
+| **Notes**       | `gitlab_list_mr_notes`, `gitlab_list_issue_notes`, `gitlab_list_epic_notes`, `gitlab_list_snippet_notes`    | Efficient pagination, consistent response format                                         |
+| **Discussions** | `gitlab_list_discussions`, `gitlab_get_discussion`, `gitlab_create_discussion`, `gitlab_resolve_discussion` | Unified interface for all resource types, cursor-based pagination, code position support |
+| **Auto-merge**  | `gitlab_set_mr_auto_merge`                                                                                  | MWPS (Merge When Pipeline Succeeds), merge train support                                 |
+| **Security**    | All vulnerability management tools                                                                          | Type-safe GID validation, mutation support                                               |
 
 ## 🏗️ Architecture
 
@@ -134,7 +134,7 @@ graph LR
     B --> B1[readTokenFromAuthStorage]
     B --> B2[getGitLabClient]
 
-    C --> C1[60+ Tool Definitions]
+    C --> C1[81 Tool Definitions]
 
     D --> A
     D --> B
@@ -287,9 +287,9 @@ Or for API tokens:
 
 ## 🛠️ Available Tools
 
-The plugin provides **102 tools** organized into the following categories:
+The plugin provides **81 tools** organized into the following categories:
 
-### Merge Request Tools (16 tools)
+### Merge Request Tools (10 tools)
 
 | Tool                              | Description                                                                                                                  |
 | --------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
@@ -298,34 +298,23 @@ The plugin provides **102 tools** organized into the following categories:
 | `gitlab_create_merge_request`     | Create a new merge request                                                                                                   |
 | `gitlab_update_merge_request`     | Update merge request title, description, state, assignees, reviewers, and labels                                             |
 | `gitlab_get_mr_changes`           | Get file changes/diffs for a merge request                                                                                   |
-| `gitlab_list_mr_discussions`      | List discussion threads on a merge request (GraphQL with cursor-based pagination)                                            |
-| `gitlab_get_mr_discussion`        | Get a specific discussion thread with all replies                                                                            |
 | `gitlab_list_mr_notes`            | List all comments with cursor-based pagination (GraphQL)                                                                     |
-| `gitlab_create_mr_note`           | Add a comment or reply to a merge request discussion                                                                         |
-| `gitlab_create_mr_discussion`     | Start a new discussion thread (optionally on specific code lines)                                                            |
-| `gitlab_resolve_mr_discussion`    | Mark a discussion as resolved after addressing feedback                                                                      |
-| `gitlab_unresolve_mr_discussion`  | Reopen a resolved discussion                                                                                                 |
 | `gitlab_get_mr_commits`           | Get all commits in a merge request                                                                                           |
 | `gitlab_get_mr_pipelines`         | Get all pipelines for a merge request                                                                                        |
 | `gitlab_list_merge_request_diffs` | List file diffs with pagination support for large changesets                                                                 |
 | `gitlab_set_mr_auto_merge`        | Enable auto-merge (MWPS) using GraphQL API when pipeline succeeds                                                            |
 
-### Issue Tools (10 tools)
+### Issue Tools (5 tools)
 
-| Tool                                | Description                                                                  |
-| ----------------------------------- | ---------------------------------------------------------------------------- |
-| `gitlab_create_issue`               | Create a new issue with title, description, labels, assignees, and milestone |
-| `gitlab_get_issue`                  | Get issue details including state, author, assignees, labels, and comments   |
-| `gitlab_list_issues`                | List issues with filtering by state, labels, assignee, and milestone         |
-| `gitlab_list_issue_notes`           | List all comments with cursor-based pagination (GraphQL)                     |
-| `gitlab_list_issue_discussions`     | List discussion threads with cursor-based pagination (GraphQL)               |
-| `gitlab_get_issue_discussion`       | Get a specific discussion thread with context                                |
-| `gitlab_create_issue_note`          | Add a comment or reply to an issue discussion                                |
-| `gitlab_get_issue_note`             | Get a specific note by ID with full details                                  |
-| `gitlab_resolve_issue_discussion`   | Mark an issue discussion as resolved                                         |
-| `gitlab_unresolve_issue_discussion` | Reopen a resolved issue discussion                                           |
+| Tool                      | Description                                                                  |
+| ------------------------- | ---------------------------------------------------------------------------- |
+| `gitlab_create_issue`     | Create a new issue with title, description, labels, assignees, and milestone |
+| `gitlab_get_issue`        | Get issue details including state, author, assignees, labels, and comments   |
+| `gitlab_list_issues`      | List issues with filtering by state, labels, assignee, and milestone         |
+| `gitlab_list_issue_notes` | List all comments with cursor-based pagination (GraphQL)                     |
+| `gitlab_get_issue_note`   | Get a specific note by ID with full details                                  |
 
-### Epic Tools (12 tools)
+### Epic Tools (9 tools)
 
 | Tool                            | Description                                                                   |
 | ------------------------------- | ----------------------------------------------------------------------------- |
@@ -337,9 +326,6 @@ The plugin provides **102 tools** organized into the following categories:
 | `gitlab_add_issue_to_epic`      | Link an issue to an epic                                                      |
 | `gitlab_remove_issue_from_epic` | Unlink an issue from an epic                                                  |
 | `gitlab_list_epic_notes`        | List all comments with cursor-based pagination (GraphQL)                      |
-| `gitlab_list_epic_discussions`  | List discussion threads with cursor-based pagination (GraphQL)                |
-| `gitlab_create_epic_note`       | Add a comment or reply to an epic discussion                                  |
-| `gitlab_get_epic_discussion`    | Get a specific epic discussion thread                                         |
 | `gitlab_get_epic_note`          | Get a specific epic note by ID                                                |
 
 ### Pipeline Tools (8 tools)
@@ -355,22 +341,17 @@ The plugin provides **102 tools** organized into the following categories:
 | `gitlab_lint_ci_config`            | Validate CI/CD YAML configuration with project context     |
 | `gitlab_lint_existing_ci_config`   | Validate existing .gitlab-ci.yml from repository           |
 
-### Repository Tools (12 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_create_commit`            | Create a commit with multiple file operations (create, update, delete, move) |
-| `gitlab_list_repository_tree`     | List files and directories at a given path                                   |
-| `gitlab_list_branches`            | List all branches in a repository                                            |
-| `gitlab_list_commit_discussions`  | List discussion threads on a commit                                          |
-| `gitlab_get_commit_discussion`    | Get a specific commit discussion thread                                      |
-| `gitlab_create_commit_note`       | Add a comment to a commit (optionally line-specific)                         |
-| `gitlab_create_commit_discussion` | Start a new discussion on a commit                                           |
-| `gitlab_get_commit_comments`      | Get all commit comments in flat structure                                    |
+### 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              |
 
 ### Search Tools (11 tools)
 
@@ -431,22 +412,20 @@ The plugin provides **102 tools** organized into the following categories:
 | `gitlab_list_project_members` | List all members of a project      |
 | `gitlab_get_current_user`     | Get authenticated user information |
 
-### Snippet Tools (5 tools)
+### Snippet Tools (1 tool)
 
-| Tool                               | Description                                                    |
-| ---------------------------------- | -------------------------------------------------------------- |
-| `gitlab_list_snippet_discussions`  | List discussion threads with cursor-based pagination (GraphQL) |
-| `gitlab_get_snippet_discussion`    | Get a specific snippet discussion thread                       |
-| `gitlab_list_snippet_notes`        | List all comments with cursor-based pagination (GraphQL)       |
-| `gitlab_create_snippet_note`       | Add a comment or reply to a snippet discussion                 |
-| `gitlab_create_snippet_discussion` | Start a new discussion on a snippet                            |
+| Tool                        | Description                                              |
+| --------------------------- | -------------------------------------------------------- |
+| `gitlab_list_snippet_notes` | List all comments with cursor-based pagination (GraphQL) |
 
-### Discussion Tools (2 tools)
+### Discussion Tools (4 tools)
 
-| Tool                         | Description                                                                                  |
-| ---------------------------- | -------------------------------------------------------------------------------------------- |
-| `gitlab_reply_to_discussion` | Universal tool for replying to any discussion thread (MRs, issues, epics, commits, snippets) |
-| `gitlab_get_discussion`      | Universal tool for fetching discussion details from any resource type                        |
+| Tool                        | Description                                                                                                              |
+| --------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `gitlab_list_discussions`   | List discussions (comment threads) on any GitLab resource (MRs, issues, epics, commits, snippets) with cursor pagination |
+| `gitlab_get_discussion`     | Get a specific discussion thread with all replies from any resource type                                                 |
+| `gitlab_create_discussion`  | Create a new discussion thread OR reply to an existing one (supports code-position comments for MRs and commits)         |
+| `gitlab_resolve_discussion` | Mark a discussion thread as resolved or unresolve it (MRs and issues only)                                               |
 
 ### Audit Event Tools (3 tools)
 
@@ -516,18 +495,29 @@ const mr = await plugin.tool.gitlab_get_merge_request.execute({
   include_changes: true,
 });
 
-// Get discussions
-const discussions = await plugin.tool.gitlab_list_mr_discussions.execute({
+// Get discussions (unified tool supports all resource types)
+const discussions = await plugin.tool.gitlab_list_discussions.execute({
+  resource_type: 'merge_request',
   project_id: 'gitlab-org/gitlab',
-  mr_iid: 12345,
+  iid: 12345,
 });
 
-// Add a review comment
-await plugin.tool.gitlab_create_mr_note.execute({
+// Add a review comment (creates a new discussion)
+await plugin.tool.gitlab_create_discussion.execute({
+  resource_type: 'merge_request',
   project_id: 'gitlab-org/gitlab',
-  mr_iid: 12345,
+  iid: 12345,
   body: 'LGTM! Great work on this feature.',
 });
+
+// Reply to an existing discussion thread
+await plugin.tool.gitlab_create_discussion.execute({
+  resource_type: 'merge_request',
+  project_id: 'gitlab-org/gitlab',
+  iid: 12345,
+  discussion_id: discussions.discussions.nodes[0].id,
+  body: 'Thanks for addressing the feedback!',
+});
 ```
 
 ### Example 3: Debug Failed Pipeline
@@ -588,10 +578,11 @@ const epicIssues = await plugin.tool.gitlab_list_epic_issues.execute({
   epic_iid: epic.iid,
 });
 
-// Add a comment
-await plugin.tool.gitlab_create_epic_note.execute({
+// Add a comment (creates a new discussion)
+await plugin.tool.gitlab_create_discussion.execute({
+  resource_type: 'epic',
   group_id: 'my-group',
-  epic_iid: epic.iid,
+  iid: epic.iid,
   body: 'Epic created and issues linked successfully!',
 });
 ```
@@ -774,11 +765,12 @@ opencode-gitlab-plugin/
 │   │   ├── merge-requests.ts # MR tool definitions
 │   │   ├── pipelines.ts    # Pipeline tool definitions
 │   │   ├── repository.ts   # Repository tool definitions
+│   │   ├── discussions-unified.ts # Unified discussion tools (4 tools)
 │   │   └── ...             # Other tool definitions
 │   ├── index.ts            # Main plugin entry point
 │   ├── utils.ts            # Utility functions
 │   └── validation.ts       # GID validation utilities
-├── tests/                  # Test suite (142 tests)
+├── tests/                  # Test suite (180 tests)
 │   ├── client/             # Client tests
 │   ├── tools/              # Tool tests
 │   ├── validation.test.ts  # Validation tests
@@ -900,7 +892,7 @@ npm run test:coverage
 
 **Test Coverage:**
 
-- **181 tests** across 21 test files
+- **180 tests** across 21 test files
 - Client tests for all API methods (REST and GraphQL)
 - Tool tests for all tool definitions
 - Validation tests for GID utilities

package/dist/index.d.ts

@@ -4,9 +4,9 @@ import { Plugin } from '@opencode-ai/plugin';
  * GitLab Tools Plugin for OpenCode
  *
  * Provides tools for interacting with GitLab:
- * - Merge requests: get, list, changes, discussions, notes (list/create), diffs (paginated)
- * - Issues: create, get, list, notes (list/create/get), discussions
- * - Epics: get, list, create, update, manage issues, notes (list/create/get), discussions
+ * - Merge requests: get, list, changes, create, update, commits, pipelines, diffs (paginated), auto-merge
+ * - Issues: create, get, list
+ * - Epics: get, list, create, update, manage issues
  * - Pipelines: list, get, jobs, logs, retry, failing jobs, CI linter
  * - Repository: get file, commits, diff, branches, tree, create commit, commit comments
  * - Search: projects, issues, MRs, blobs, commits, etc.
@@ -17,8 +17,8 @@ import { Plugin } from '@opencode-ai/plugin';
  * - Audit: list project/group/instance audit events
  * - Wikis: get wiki page
  * - Work Items: get, list, create, update, notes
- * - Snippets: discussions, notes
- * - Discussions: universal discussion tools for all resource types
+ * - 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
  */
 declare const gitlabPlugin: Plugin;

package/dist/index.js

@@ -2086,29 +2086,6 @@ Returns the list of files changed with their diffs.`,
       return JSON.stringify(changes, null, 2);
     }
   }),
-  gitlab_list_mr_discussions: tool({
-    description: `List discussions (comment threads) on a merge request.
-Returns all discussion threads with nested notes. Each discussion contains a 'notes' array with individual comments.
-Note: For a flattened list of all comments, use gitlab_list_mr_notes instead.`,
-    args: {
-      project_id: z.string().describe("The project ID or URL-encoded path"),
-      mr_iid: z.number().describe("The internal ID of the merge request"),
-      first: z.number().optional().describe("Number of discussions to fetch from the beginning (default: 20)"),
-      after: z.string().optional().describe("Cursor for forward pagination (from pageInfo.endCursor)"),
-      last: z.number().optional().describe("Number of discussions to fetch from the end"),
-      before: z.string().optional().describe("Cursor for backward pagination (from pageInfo.startCursor)")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussions = await client.listMrDiscussions(args.project_id, args.mr_iid, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(discussions, null, 2);
-    }
-  }),
   gitlab_list_mr_notes: tool({
     description: `List all notes/comments on a merge request using GraphQL API with pagination support.
 Returns all comments including system notes, code review comments, and general discussion.
@@ -2136,117 +2113,6 @@ Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
       return JSON.stringify(result, null, 2);
     }
   }),
-  gitlab_create_mr_note: tool({
-    description: `Add a comment/note to a merge request.
-If discussion_id is provided, the note will be added as a reply to an existing discussion thread.
-Use gitlab_list_mr_discussions to find discussion IDs for existing threads.`,
-    args: {
-      project_id: z.string().describe("The project ID or URL-encoded path"),
-      mr_iid: z.number().describe("The internal ID of the merge request"),
-      body: z.string().describe("The content of the note/comment (supports Markdown)"),
-      discussion_id: z.string().optional().describe(
-        "The ID of a discussion thread to reply to. If provided, the note will be added as a reply to that discussion."
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.createMrNote(
-        args.project_id,
-        args.mr_iid,
-        args.body,
-        args.discussion_id
-      );
-      return JSON.stringify(note, null, 2);
-    }
-  }),
-  gitlab_get_mr_discussion: tool({
-    description: `Get a specific discussion thread from a merge request with all its replies.
-Returns the discussion with its 'notes' array containing all comments in the thread.
-Use this to get the full context of a specific conversation.`,
-    args: {
-      project_id: z.string().describe("The project ID or URL-encoded path"),
-      mr_iid: z.number().describe("The internal ID of the merge request"),
-      discussion_id: z.string().describe("The ID of the discussion thread")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.getMrDiscussion(
-        args.project_id,
-        args.mr_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
-  gitlab_resolve_mr_discussion: tool({
-    description: `Mark a merge request discussion thread as resolved.
-Use this after addressing feedback in a code review to indicate the discussion is complete.
-Only works for resolvable discussions (typically code review comments).`,
-    args: {
-      project_id: z.string().describe("The project ID or URL-encoded path"),
-      mr_iid: z.number().describe("The internal ID of the merge request"),
-      discussion_id: z.string().describe("The ID of the discussion thread to resolve")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.resolveMrDiscussion(
-        args.project_id,
-        args.mr_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
-  gitlab_unresolve_mr_discussion: tool({
-    description: `Reopen a resolved merge request discussion thread.
-Use this to indicate that a previously resolved discussion needs more attention.`,
-    args: {
-      project_id: z.string().describe("The project ID or URL-encoded path"),
-      mr_iid: z.number().describe("The internal ID of the merge request"),
-      discussion_id: z.string().describe("The ID of the discussion thread to unresolve")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.unresolveMrDiscussion(
-        args.project_id,
-        args.mr_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
-  gitlab_create_mr_discussion: tool({
-    description: `Start a new discussion thread on a merge request.
-Creates a new discussion with an initial comment. Optionally can be positioned on specific code.
-For general comments, just provide the body. For code comments, provide position information.`,
-    args: {
-      project_id: z.string().describe("The project ID or URL-encoded path"),
-      mr_iid: z.number().describe("The internal ID of the merge request"),
-      body: z.string().describe("The content of the initial comment (supports Markdown)"),
-      position: z.object({
-        base_sha: z.string().describe("SHA of the base commit (merge base)"),
-        start_sha: z.string().describe("SHA of the commit when the MR was created"),
-        head_sha: z.string().describe("SHA of the HEAD commit"),
-        position_type: z.enum(["text", "image"]).describe("Type of position (text or image)"),
-        new_path: z.string().optional().describe("Path of the file after changes"),
-        old_path: z.string().optional().describe("Path of the file before changes"),
-        new_line: z.number().optional().describe("Line number in the new version"),
-        old_line: z.number().optional().describe("Line number in the old version")
-      }).optional().describe(
-        "Position information for code comments. Required fields: base_sha, start_sha, head_sha, position_type. For line comments also provide new_path/old_path and new_line/old_line."
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.createMrDiscussion(
-        args.project_id,
-        args.mr_iid,
-        args.body,
-        args.position
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
   gitlab_create_merge_request: tool({
     description: `Create a new merge request.
 Returns the created merge request with all details.`,
@@ -2491,108 +2357,6 @@ Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
       return JSON.stringify(result, null, 2);
     }
   }),
-  gitlab_list_issue_discussions: tool2({
-    description: `List discussions (comment threads) on an issue.
-Returns all discussion threads with nested notes. Each discussion contains a 'notes' array with individual comments.
-Use the discussion 'id' field to reply to a specific thread with gitlab_create_issue_note.`,
-    args: {
-      project_id: z2.string().describe("The project ID or URL-encoded path"),
-      issue_iid: z2.number().describe("The internal ID of the issue"),
-      first: z2.number().optional().describe("Number of discussions to fetch from the beginning (default: 20)"),
-      after: z2.string().optional().describe("Cursor for forward pagination (from pageInfo.endCursor)"),
-      last: z2.number().optional().describe("Number of discussions to fetch from the end"),
-      before: z2.string().optional().describe("Cursor for backward pagination (from pageInfo.startCursor)")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussions = await client.listIssueDiscussions(args.project_id, args.issue_iid, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(discussions, null, 2);
-    }
-  }),
-  gitlab_create_issue_note: tool2({
-    description: `Add a comment/note to an issue.
-If discussion_id is provided, the note will be added as a reply to an existing discussion thread.
-Use gitlab_list_issue_discussions to find discussion IDs for existing threads.`,
-    args: {
-      project_id: z2.string().describe("The project ID or URL-encoded path"),
-      issue_iid: z2.number().describe("The internal ID of the issue"),
-      body: z2.string().describe("The content of the note/comment (supports Markdown)"),
-      discussion_id: z2.string().optional().describe(
-        "The ID of a discussion thread to reply to. If provided, the note will be added as a reply to that discussion."
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.createIssueNote(
-        args.project_id,
-        args.issue_iid,
-        args.body,
-        args.discussion_id
-      );
-      return JSON.stringify(note, null, 2);
-    }
-  }),
-  gitlab_get_issue_discussion: tool2({
-    description: `Get a specific discussion thread from an issue with all its replies.
-Returns the discussion with its 'notes' array containing all comments in the thread.
-Use this to get the full context of a specific conversation.`,
-    args: {
-      project_id: z2.string().describe("The project ID or URL-encoded path"),
-      issue_iid: z2.number().describe("The internal ID of the issue"),
-      discussion_id: z2.string().describe("The ID of the discussion thread")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.getIssueDiscussion(
-        args.project_id,
-        args.issue_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
-  gitlab_resolve_issue_discussion: tool2({
-    description: `Mark an issue discussion thread as resolved.
-Use this after addressing feedback in a code review or issue discussion to indicate the discussion is complete.
-Only works for resolvable discussions (typically multi-note threads, not individual notes).`,
-    args: {
-      project_id: z2.string().describe("The project ID or URL-encoded path"),
-      issue_iid: z2.number().describe("The internal ID of the issue"),
-      discussion_id: z2.string().describe("The ID of the discussion thread to resolve")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.resolveIssueDiscussion(
-        args.project_id,
-        args.issue_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
-  gitlab_unresolve_issue_discussion: tool2({
-    description: `Reopen a resolved issue discussion thread.
-Use this to indicate that a previously resolved discussion needs more attention or further discussion.`,
-    args: {
-      project_id: z2.string().describe("The project ID or URL-encoded path"),
-      issue_iid: z2.number().describe("The internal ID of the issue"),
-      discussion_id: z2.string().describe("The ID of the discussion thread to unresolve")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.unresolveIssueDiscussion(
-        args.project_id,
-        args.issue_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
   gitlab_get_issue_note: tool2({
     description: `Get a single note/comment from an issue by its ID.
 Returns the full details of a specific note including author, body, timestamps, and metadata.
@@ -2777,71 +2541,6 @@ Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
       return JSON.stringify(result, null, 2);
     }
   }),
-  gitlab_list_epic_discussions: tool3({
-    description: `List discussions (comment threads) on an epic.
-Returns all discussion threads with nested notes. Each discussion contains a 'notes' array with individual comments.
-Use the discussion 'id' field to reply to a specific thread with gitlab_create_epic_note.`,
-    args: {
-      group_id: z3.string().describe("The group ID or URL-encoded path"),
-      epic_iid: z3.number().describe("The internal ID of the epic"),
-      first: z3.number().optional().describe("Number of discussions to fetch from the beginning (default: 20)"),
-      after: z3.string().optional().describe("Cursor for forward pagination (from pageInfo.endCursor)"),
-      last: z3.number().optional().describe("Number of discussions to fetch from the end"),
-      before: z3.string().optional().describe("Cursor for backward pagination (from pageInfo.startCursor)")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussions = await client.listEpicDiscussions(args.group_id, args.epic_iid, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(discussions, null, 2);
-    }
-  }),
-  gitlab_create_epic_note: tool3({
-    description: `Add a comment/note to an epic.
-If discussion_id is provided, the note will be added as a reply to an existing discussion thread.
-Use gitlab_list_epic_discussions to find discussion IDs for existing threads.`,
-    args: {
-      group_id: z3.string().describe("The group ID or URL-encoded path"),
-      epic_iid: z3.number().describe("The internal ID of the epic"),
-      body: z3.string().describe("The content of the note/comment (supports Markdown)"),
-      discussion_id: z3.string().optional().describe(
-        "The ID of a discussion thread to reply to. If provided, the note will be added as a reply to that discussion."
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.createEpicNote(
-        args.group_id,
-        args.epic_iid,
-        args.body,
-        args.discussion_id
-      );
-      return JSON.stringify(note, null, 2);
-    }
-  }),
-  gitlab_get_epic_discussion: tool3({
-    description: `Get a specific discussion thread from an epic with all its replies.
-Returns the discussion with its 'notes' array containing all comments in the thread.
-Use this to get the full context of a specific conversation.`,
-    args: {
-      group_id: z3.string().describe("The group ID or URL-encoded path"),
-      epic_iid: z3.number().describe("The internal ID of the epic"),
-      discussion_id: z3.string().describe("The ID of the discussion thread")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.getEpicDiscussion(
-        args.group_id,
-        args.epic_iid,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
   gitlab_get_epic_note: tool3({
     description: `Get a single note/comment from an epic by its ID.
 Returns the full details of a specific note including author, body, timestamps, and metadata.
@@ -3092,40 +2791,6 @@ Returns commit metadata including author, message, stats, and parent commits.`,
       return JSON.stringify(diff, null, 2);
     }
   }),
-  gitlab_create_commit: tool5({
-    description: `Create a commit with multiple file actions.
-Supports creating, updating, deleting, moving files, and changing permissions.`,
-    args: {
-      project_id: z5.string().describe("The project ID or URL-encoded path"),
-      branch: z5.string().describe("Name of the branch to commit into"),
-      commit_message: z5.string().describe("Commit message"),
-      actions: z5.array(
-        z5.object({
-          action: z5.enum(["create", "delete", "move", "update", "chmod"]).describe("The action to perform"),
-          file_path: z5.string().describe("Full path to the file"),
-          content: z5.string().optional().describe("File content (required for create/update)"),
-          encoding: z5.enum(["text", "base64"]).optional().describe("Encoding of content (default: text)"),
-          previous_path: z5.string().optional().describe("Original path (required for move)"),
-          execute_filemode: z5.boolean().optional().describe("Enable/disable execute flag (for chmod)")
-        })
-      ).describe("Array of file actions to perform"),
-      author_email: z5.string().optional().describe("Author email address"),
-      author_name: z5.string().optional().describe("Author name"),
-      start_branch: z5.string().optional().describe("Name of the branch to start from (if different from target branch)")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const commit = await client.createCommit(args.project_id, {
-        branch: args.branch,
-        commit_message: args.commit_message,
-        actions: args.actions,
-        author_email: args.author_email,
-        author_name: args.author_name,
-        start_branch: args.start_branch
-      });
-      return JSON.stringify(commit, null, 2);
-    }
-  }),
   gitlab_list_repository_tree: tool5({
     description: `List files and directories in a repository.
 Returns the tree structure of the repository at a given path and ref.`,
@@ -3159,101 +2824,6 @@ Returns the tree structure of the repository at a given path and ref.`,
       return JSON.stringify(branches, null, 2);
     }
   }),
-  // ========== Commit Discussion Tools ==========
-  gitlab_list_commit_discussions: tool5({
-    description: `List discussions (comment threads) on a commit.
-Returns all discussion threads with nested notes. Each discussion contains a 'notes' array with individual comments.
-Use the discussion 'id' field to reply to a specific thread with gitlab_create_commit_note.`,
-    args: {
-      project_id: z5.string().describe("The project ID or URL-encoded path"),
-      sha: z5.string().describe("The commit SHA")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussions = await client.listCommitDiscussions(args.project_id, args.sha);
-      return JSON.stringify(discussions, null, 2);
-    }
-  }),
-  gitlab_get_commit_discussion: tool5({
-    description: `Get a specific discussion thread from a commit with all its replies.
-Returns the discussion with its 'notes' array containing all comments in the thread.
-Use this to get the full context of a specific conversation.`,
-    args: {
-      project_id: z5.string().describe("The project ID or URL-encoded path"),
-      sha: z5.string().describe("The commit SHA"),
-      discussion_id: z5.string().describe("The ID of the discussion thread")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.getCommitDiscussion(
-        args.project_id,
-        args.sha,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
-  gitlab_create_commit_note: tool5({
-    description: `Add a comment/note to a commit.
-If discussion_id is provided, the note will be added as a reply to an existing discussion thread.
-Optionally, you can create a line-specific comment by providing path, line, and line_type.
-Use gitlab_list_commit_discussions to find discussion IDs for existing threads.`,
-    args: {
-      project_id: z5.string().describe("The project ID or URL-encoded path"),
-      sha: z5.string().describe("The commit SHA"),
-      body: z5.string().describe("The content of the note/comment (supports Markdown)"),
-      discussion_id: z5.string().optional().describe(
-        "The ID of a discussion thread to reply to. If provided, the note will be added as a reply to that discussion."
-      ),
-      path: z5.string().optional().describe("The file path to comment on (for line-specific comments)"),
-      line: z5.number().optional().describe("The line number to comment on (for line-specific comments)"),
-      line_type: z5.enum(["new", "old"]).optional().describe(
-        'The type of line being commented on: "new" for added lines, "old" for removed lines'
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.createCommitNote(args.project_id, args.sha, args.body, {
-        discussion_id: args.discussion_id,
-        path: args.path,
-        line: args.line,
-        line_type: args.line_type
-      });
-      return JSON.stringify(note, null, 2);
-    }
-  }),
-  gitlab_create_commit_discussion: tool5({
-    description: `Start a new discussion thread on a commit.
-Creates a new discussion with an initial comment. Optionally can be positioned on specific code.
-For general comments, just provide the body. For code comments, provide position information.`,
-    args: {
-      project_id: z5.string().describe("The project ID or URL-encoded path"),
-      sha: z5.string().describe("The commit SHA"),
-      body: z5.string().describe("The content of the initial comment (supports Markdown)"),
-      position: z5.object({
-        base_sha: z5.string().describe("SHA of the base commit"),
-        start_sha: z5.string().describe("SHA of the start commit"),
-        head_sha: z5.string().describe("SHA of the HEAD commit"),
-        position_type: z5.enum(["text", "image"]).describe("Type of position (text or image)"),
-        new_path: z5.string().optional().describe("Path of the file after changes"),
-        old_path: z5.string().optional().describe("Path of the file before changes"),
-        new_line: z5.number().optional().describe("Line number in the new version"),
-        old_line: z5.number().optional().describe("Line number in the old version")
-      }).optional().describe(
-        "Position information for code comments. Required fields: base_sha, start_sha, head_sha, position_type. For line comments also provide new_path/old_path and new_line/old_line."
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.createCommitDiscussion(
-        args.project_id,
-        args.sha,
-        args.body,
-        args.position
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
   gitlab_get_commit_comments: tool5({
     description: `Get all comments on a specific commit.
 Returns all comments (notes) that have been added to a commit, including line-specific comments.
@@ -3269,12 +2839,6 @@ This is different from discussions - it returns individual comments in a flat st
     }
   })
 };
-var commitDiscussionTools = {
-  gitlab_list_commit_discussions: repositoryTools.gitlab_list_commit_discussions,
-  gitlab_get_commit_discussion: repositoryTools.gitlab_get_commit_discussion,
-  gitlab_create_commit_note: repositoryTools.gitlab_create_commit_note,
-  gitlab_create_commit_discussion: repositoryTools.gitlab_create_commit_discussion
-};
 
 // src/tools/search.ts
 import { tool as tool6 } from "@opencode-ai/plugin";
@@ -3760,48 +3324,6 @@ Requires Developer role or higher.`,
 import { tool as tool9 } from "@opencode-ai/plugin";
 var z9 = tool9.schema;
 var snippetTools = {
-  gitlab_list_snippet_discussions: tool9({
-    description: `List discussions (comment threads) on a project snippet.
-Returns all discussion threads with nested notes. Each discussion contains a 'notes' array with individual comments.
-Use the discussion 'id' field to reply to a specific thread with gitlab_create_snippet_note.`,
-    args: {
-      project_id: z9.string().describe("The project ID or URL-encoded path"),
-      snippet_id: z9.number().describe("The ID of the snippet"),
-      first: z9.number().optional().describe("Number of discussions to fetch from the beginning (default: 20)"),
-      after: z9.string().optional().describe("Cursor for forward pagination (from pageInfo.endCursor)"),
-      last: z9.number().optional().describe("Number of discussions to fetch from the end"),
-      before: z9.string().optional().describe("Cursor for backward pagination (from pageInfo.startCursor)")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussions = await client.listSnippetDiscussions(args.project_id, args.snippet_id, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(discussions, null, 2);
-    }
-  }),
-  gitlab_get_snippet_discussion: tool9({
-    description: `Get a specific discussion thread from a snippet with all its replies.
-Returns the discussion with its 'notes' array containing all comments in the thread.
-Use this to get the full context of a specific conversation.`,
-    args: {
-      project_id: z9.string().describe("The project ID or URL-encoded path"),
-      snippet_id: z9.number().describe("The ID of the snippet"),
-      discussion_id: z9.string().describe("The ID of the discussion thread")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.getSnippetDiscussion(
-        args.project_id,
-        args.snippet_id,
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
-  }),
   gitlab_list_snippet_notes: tool9({
     description: `List all notes/comments on a project snippet using GraphQL API with pagination support.
 Returns all comments including system notes in chronological order.
@@ -3827,47 +3349,6 @@ Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
       });
       return JSON.stringify(result, null, 2);
     }
-  }),
-  gitlab_create_snippet_note: tool9({
-    description: `Add a comment/note to a project snippet.
-If discussion_id is provided, the note will be added as a reply to an existing discussion thread.
-Use gitlab_list_snippet_discussions to find discussion IDs for existing threads.`,
-    args: {
-      project_id: z9.string().describe("The project ID or URL-encoded path"),
-      snippet_id: z9.number().describe("The ID of the snippet"),
-      body: z9.string().describe("The content of the note/comment (supports Markdown)"),
-      discussion_id: z9.string().optional().describe(
-        "The ID of a discussion thread to reply to. If provided, the note will be added as a reply to that discussion."
-      )
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.createSnippetNote(
-        args.project_id,
-        args.snippet_id,
-        args.body,
-        args.discussion_id
-      );
-      return JSON.stringify(note, null, 2);
-    }
-  }),
-  gitlab_create_snippet_discussion: tool9({
-    description: `Start a new discussion thread on a project snippet.
-Creates a new discussion with an initial comment.`,
-    args: {
-      project_id: z9.string().describe("The project ID or URL-encoded path"),
-      snippet_id: z9.number().describe("The ID of the snippet"),
-      body: z9.string().describe("The content of the initial comment (supports Markdown)")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const discussion = await client.createSnippetDiscussion(
-        args.project_id,
-        args.snippet_id,
-        args.body
-      );
-      return JSON.stringify(discussion, null, 2);
-    }
   })
 };
 
@@ -4093,68 +3574,321 @@ Can update title, description, state, labels, and assignees.`,
   })
 };
 
-// src/tools/discussions.ts
+// src/tools/discussions-unified.ts
 import { tool as tool13 } from "@opencode-ai/plugin";
 var z13 = tool13.schema;
-var discussionTools = {
-  gitlab_reply_to_discussion: tool13({
-    description: `Universal tool for replying to any discussion thread across GitLab resources.
-Supports replying to discussions on: merge requests, issues, epics, commits, and snippets.
-This provides a consistent interface for thread replies regardless of the resource type.`,
+var positionSchema = z13.object({
+  base_sha: z13.string().describe("SHA of the base commit"),
+  start_sha: z13.string().describe("SHA of the start commit"),
+  head_sha: z13.string().describe("SHA of the head commit"),
+  position_type: z13.enum(["text", "image"]).describe("Type of position"),
+  old_path: z13.string().optional().describe("Path of the file before changes"),
+  new_path: z13.string().optional().describe("Path of the file after changes"),
+  old_line: z13.number().optional().describe("Line number in the old version"),
+  new_line: z13.number().optional().describe("Line number in the new version")
+});
+function validateResourceParams(resourceType, args) {
+  switch (resourceType) {
+    case "merge_request":
+    case "issue":
+      if (!args.project_id) throw new Error(`project_id is required for ${resourceType}`);
+      if (args.iid == null) throw new Error(`iid is required for ${resourceType}`);
+      break;
+    case "epic":
+      if (!args.group_id) throw new Error("group_id is required for epic");
+      if (args.iid == null) throw new Error("iid is required for epic");
+      break;
+    case "commit":
+      if (!args.project_id) throw new Error("project_id is required for commit");
+      if (!args.sha) throw new Error("sha is required for commit");
+      break;
+    case "snippet":
+      if (!args.project_id) throw new Error("project_id is required for snippet");
+      if (args.snippet_id == null) throw new Error("snippet_id is required for snippet");
+      break;
+  }
+}
+var discussionsUnifiedTools = {
+  /**
+   * List discussions for any GitLab resource type
+   */
+  gitlab_list_discussions: tool13({
+    description: `List discussions (comment threads) on any GitLab resource.
+Supports: merge_requests, issues, epics, commits, snippets.
+
+Returns discussion threads with nested notes. Each discussion contains 
+a 'notes' array with individual comments.
+
+For pagination, use 'after' with the 'endCursor' from pageInfo to get the next page.
+
+Examples:
+- MR: resource_type="merge_request", project_id="group/project", iid=123
+- Issue: resource_type="issue", project_id="group/project", iid=456  
+- Epic: resource_type="epic", group_id="my-group", iid=1
+- Commit: resource_type="commit", project_id="group/project", sha="abc123"
+- Snippet: resource_type="snippet", project_id="group/project", snippet_id=789`,
     args: {
-      resource_type: z13.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("The type of resource the discussion belongs to"),
-      project_id: z13.string().optional().describe("The project ID or URL-encoded path (required for all except epic)"),
-      group_id: z13.string().optional().describe("The group ID or URL-encoded path (required for epic)"),
-      iid: z13.number().optional().describe("The internal ID of the resource (required for merge_request, issue, epic)"),
-      sha: z13.string().optional().describe("The commit SHA (required for commit)"),
-      snippet_id: z13.number().optional().describe("The snippet ID (required for snippet)"),
-      discussion_id: z13.string().describe("The ID of the discussion thread to reply to"),
-      body: z13.string().describe("The content of the reply (supports Markdown)")
+      resource_type: z13.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("Type of GitLab resource"),
+      project_id: z13.string().optional().describe("Project ID or path. Required for merge_request, issue, commit, snippet"),
+      group_id: z13.string().optional().describe("Group ID or path. Required for epic"),
+      iid: z13.number().optional().describe("Internal ID of the resource (for merge_request, issue, epic)"),
+      sha: z13.string().optional().describe("Commit SHA (required for commit)"),
+      snippet_id: z13.number().optional().describe("Snippet ID (required for snippet)"),
+      // Pagination
+      first: z13.number().optional().describe("Number of items to return (default: 20)"),
+      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")
     },
     execute: async (args, _ctx) => {
+      validateResourceParams(args.resource_type, args);
       const client = getGitLabClient();
-      const note = await client.replyToDiscussion(
-        args.resource_type,
-        {
-          projectId: args.project_id,
-          groupId: args.group_id,
-          iid: args.iid,
-          sha: args.sha,
-          snippetId: args.snippet_id
-        },
-        args.discussion_id,
-        args.body
-      );
-      return JSON.stringify(note, null, 2);
+      const paginationOptions = {
+        first: args.first,
+        after: args.after,
+        before: args.before,
+        last: args.last
+      };
+      switch (args.resource_type) {
+        case "merge_request":
+          return JSON.stringify(
+            await client.listMrDiscussions(args.project_id, args.iid, paginationOptions),
+            null,
+            2
+          );
+        case "issue":
+          return JSON.stringify(
+            await client.listIssueDiscussions(args.project_id, args.iid, paginationOptions),
+            null,
+            2
+          );
+        case "epic":
+          return JSON.stringify(
+            await client.listEpicDiscussions(args.group_id, args.iid, paginationOptions),
+            null,
+            2
+          );
+        case "commit":
+          return JSON.stringify(
+            await client.listCommitDiscussions(args.project_id, args.sha),
+            null,
+            2
+          );
+        case "snippet":
+          return JSON.stringify(
+            await client.listSnippetDiscussions(
+              args.project_id,
+              args.snippet_id,
+              paginationOptions
+            ),
+            null,
+            2
+          );
+        default:
+          throw new Error(`Unsupported resource type: ${args.resource_type}`);
+      }
     }
   }),
+  /**
+   * Get a specific discussion thread from any GitLab resource
+   */
   gitlab_get_discussion: tool13({
-    description: `Universal tool for fetching discussion details from any GitLab resource.
-Supports getting discussions from: merge requests, issues, epics, commits, and snippets.
-Returns the discussion with its 'notes' array containing all comments in the thread.`,
+    description: `Get a specific discussion thread with all its replies.
+Returns the discussion with its 'notes' array containing all comments.
+
+Use this to get full context of a specific conversation.
+
+Required parameters vary by resource type:
+- merge_request: project_id, iid, discussion_id
+- issue: project_id, iid, discussion_id  
+- epic: group_id, iid, discussion_id
+- commit: project_id, sha, discussion_id
+- snippet: project_id, snippet_id, discussion_id`,
     args: {
-      resource_type: z13.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("The type of resource the discussion belongs to"),
-      project_id: z13.string().optional().describe("The project ID or URL-encoded path (required for all except epic)"),
-      group_id: z13.string().optional().describe("The group ID or URL-encoded path (required for epic)"),
-      iid: z13.number().optional().describe("The internal ID of the resource (required for merge_request, issue, epic)"),
-      sha: z13.string().optional().describe("The commit SHA (required for commit)"),
-      snippet_id: z13.number().optional().describe("The snippet ID (required for snippet)"),
-      discussion_id: z13.string().describe("The ID of the discussion thread to fetch")
+      resource_type: z13.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("Type of GitLab resource"),
+      discussion_id: z13.string().describe("The ID of the discussion thread"),
+      project_id: z13.string().optional().describe("Project ID or path"),
+      group_id: z13.string().optional().describe("Group ID or path (for epic)"),
+      iid: z13.number().optional().describe("Internal ID (for merge_request, issue, epic)"),
+      sha: z13.string().optional().describe("Commit SHA (for commit)"),
+      snippet_id: z13.number().optional().describe("Snippet ID (for snippet)")
     },
     execute: async (args, _ctx) => {
+      validateResourceParams(args.resource_type, args);
       const client = getGitLabClient();
-      const discussion = await client.getDiscussion(
-        args.resource_type,
-        {
-          projectId: args.project_id,
-          groupId: args.group_id,
-          iid: args.iid,
-          sha: args.sha,
-          snippetId: args.snippet_id
-        },
-        args.discussion_id
-      );
-      return JSON.stringify(discussion, null, 2);
+      switch (args.resource_type) {
+        case "merge_request":
+          return JSON.stringify(
+            await client.getMrDiscussion(args.project_id, args.iid, args.discussion_id),
+            null,
+            2
+          );
+        case "issue":
+          return JSON.stringify(
+            await client.getIssueDiscussion(args.project_id, args.iid, args.discussion_id),
+            null,
+            2
+          );
+        case "epic":
+          return JSON.stringify(
+            await client.getEpicDiscussion(args.group_id, args.iid, args.discussion_id),
+            null,
+            2
+          );
+        case "commit":
+          return JSON.stringify(
+            await client.getCommitDiscussion(args.project_id, args.sha, args.discussion_id),
+            null,
+            2
+          );
+        case "snippet":
+          return JSON.stringify(
+            await client.getSnippetDiscussion(
+              args.project_id,
+              args.snippet_id,
+              args.discussion_id
+            ),
+            null,
+            2
+          );
+        default:
+          throw new Error(`Unsupported resource type: ${args.resource_type}`);
+      }
+    }
+  }),
+  /**
+   * Create a new discussion thread or reply to an existing one
+   */
+  gitlab_create_discussion: tool13({
+    description: `Create a new discussion thread or reply to an existing one.
+
+For NEW discussion: Omit discussion_id
+For REPLY to existing thread: Include discussion_id (preferred over gitlab_create_note for threaded conversations)
+
+For code-specific comments on MRs/commits, provide position information.
+
+Examples:
+- New MR comment: resource_type="merge_request", project_id="...", iid=123, body="..."
+- Reply to thread: resource_type="merge_request", ..., discussion_id="...", body="..."  
+- Code comment: resource_type="merge_request", ..., body="...", position={base_sha, head_sha, ...}`,
+    args: {
+      resource_type: z13.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("Type of GitLab resource"),
+      body: z13.string().describe("The comment text (Markdown supported)"),
+      project_id: z13.string().optional().describe("Project ID or path"),
+      group_id: z13.string().optional().describe("Group ID or path (for epic)"),
+      iid: z13.number().optional().describe("Internal ID (for merge_request, issue, epic)"),
+      sha: z13.string().optional().describe("Commit SHA (for commit)"),
+      snippet_id: z13.number().optional().describe("Snippet ID (for snippet)"),
+      discussion_id: z13.string().optional().describe("If provided, replies to existing discussion. If omitted, creates new thread"),
+      position: positionSchema.optional().describe("Position for code-specific comments (MR/commit only)")
+    },
+    execute: async (args, _ctx) => {
+      validateResourceParams(args.resource_type, args);
+      const client = getGitLabClient();
+      if (args.discussion_id) {
+        const note = await client.replyToDiscussion(
+          args.resource_type,
+          {
+            projectId: args.project_id,
+            groupId: args.group_id,
+            iid: args.iid,
+            sha: args.sha,
+            snippetId: args.snippet_id
+          },
+          args.discussion_id,
+          args.body
+        );
+        return JSON.stringify(note, null, 2);
+      }
+      switch (args.resource_type) {
+        case "merge_request":
+          return JSON.stringify(
+            await client.createMrDiscussion(args.project_id, args.iid, args.body, args.position),
+            null,
+            2
+          );
+        case "issue":
+          return JSON.stringify(
+            await client.createIssueNote(args.project_id, args.iid, args.body),
+            null,
+            2
+          );
+        case "epic":
+          return JSON.stringify(
+            await client.createEpicNote(args.group_id, args.iid, args.body),
+            null,
+            2
+          );
+        case "commit":
+          return JSON.stringify(
+            await client.createCommitDiscussion(
+              args.project_id,
+              args.sha,
+              args.body,
+              args.position
+            ),
+            null,
+            2
+          );
+        case "snippet":
+          return JSON.stringify(
+            await client.createSnippetDiscussion(args.project_id, args.snippet_id, args.body),
+            null,
+            2
+          );
+        default:
+          throw new Error(`Unsupported resource type: ${args.resource_type}`);
+      }
+    }
+  }),
+  /**
+   * Resolve or unresolve a discussion thread
+   */
+  gitlab_resolve_discussion: tool13({
+    description: `Mark a discussion thread as resolved or unresolve it.
+Only works for resolvable discussions (MRs and issues only).
+
+Use after addressing feedback to indicate the discussion is complete.`,
+    args: {
+      resource_type: z13.enum(["merge_request", "issue"]).describe("Type of resource (only MR and issue discussions can be resolved)"),
+      action: z13.enum(["resolve", "unresolve"]).describe("Whether to resolve or unresolve"),
+      discussion_id: z13.string().describe("The ID of the discussion thread"),
+      project_id: z13.string().describe("Project ID or path"),
+      iid: z13.number().describe("Internal ID of the MR or issue")
+    },
+    execute: async (args, _ctx) => {
+      const client = getGitLabClient();
+      if (args.action === "resolve") {
+        switch (args.resource_type) {
+          case "merge_request":
+            return JSON.stringify(
+              await client.resolveMrDiscussion(args.project_id, args.iid, args.discussion_id),
+              null,
+              2
+            );
+          case "issue":
+            return JSON.stringify(
+              await client.resolveIssueDiscussion(args.project_id, args.iid, args.discussion_id),
+              null,
+              2
+            );
+        }
+      } else {
+        switch (args.resource_type) {
+          case "merge_request":
+            return JSON.stringify(
+              await client.unresolveMrDiscussion(args.project_id, args.iid, args.discussion_id),
+              null,
+              2
+            );
+          case "issue":
+            return JSON.stringify(
+              await client.unresolveIssueDiscussion(args.project_id, args.iid, args.discussion_id),
+              null,
+              2
+            );
+        }
+      }
     }
   })
 };
@@ -4523,10 +4257,8 @@ var gitlabPlugin = async (_input) => {
       ...wikiTools,
       // Work Item Tools
       ...workItemTools,
-      // Commit Discussion Tools
-      ...commitDiscussionTools,
-      // Universal Discussion Tools
-      ...discussionTools,
+      // Unified Discussion Tools (covers MR, issue, epic, commit, snippet discussions)
+      ...discussionsUnifiedTools,
       // Git Tools
       ...gitTools,
       // Audit Tools

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/opencode-gitlab-plugin",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "GitLab tools plugin for OpenCode - provides GitLab API access for merge requests, issues, pipelines, and more",
   "type": "module",
   "main": "dist/index.js",