@gitlab/opencode-gitlab-plugin 1.5.4 → 1.5.5

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.5](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/compare/v1.5.4...v1.5.5) (2026-02-03)
+
+
+### ♻️ Code Refactoring
+
+* consolidate notes tools into unified interface ([2e407ad](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/commit/2e407ad9bce03b7c6b2220ab39d6dac9bc82ebd4))
+* improve validation error messages in notes tools ([3c95ca6](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/commit/3c95ca66281378f480250ed549611e352319b001))
+
 ## [1.5.4](https://gitlab.com/gitlab-org/editor-extensions/opencode-gitlab-plugin/compare/v1.5.3...v1.5.4) (2026-02-03)
 
 

package/README.md

@@ -62,7 +62,7 @@ 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                                         |
+| **Notes**       | `gitlab_list_notes`, `gitlab_get_note`, `gitlab_create_note`                                                | Unified interface for all resource types, efficient pagination                           |
 | **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                                               |
@@ -134,7 +134,7 @@ graph LR
     B --> B1[readTokenFromAuthStorage]
     B --> B2[getGitLabClient]
 
-    C --> C1[81 Tool Definitions]
+    C --> C1[78 Tool Definitions]
 
     D --> A
     D --> B
@@ -287,9 +287,9 @@ Or for API tokens:
 
 ## 🛠️ Available Tools
 
-The plugin provides **81 tools** organized into the following categories:
+The plugin provides **78 tools** organized into the following categories:
 
-### Merge Request Tools (10 tools)
+### Merge Request Tools (9 tools)
 
 | Tool                              | Description                                                                                                                  |
 | --------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
@@ -298,23 +298,20 @@ The plugin provides **81 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_notes`            | List all comments with cursor-based pagination (GraphQL)                                                                     |
 | `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 (5 tools)
+### Issue Tools (3 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_get_issue_note`   | Get a specific note by ID with full details                                  |
+| 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         |
 
-### Epic Tools (9 tools)
+### Epic Tools (7 tools)
 
 | Tool                            | Description                                                                   |
 | ------------------------------- | ----------------------------------------------------------------------------- |
@@ -325,8 +322,6 @@ The plugin provides **81 tools** organized into the following categories:
 | `gitlab_list_epic_issues`       | Get all issues linked to an epic                                              |
 | `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_get_epic_note`          | Get a specific epic note by ID                                                |
 
 ### Pipeline Tools (8 tools)
 
@@ -412,12 +407,6 @@ The plugin provides **81 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 (1 tool)
-
-| Tool                        | Description                                              |
-| --------------------------- | -------------------------------------------------------- |
-| `gitlab_list_snippet_notes` | List all comments with cursor-based pagination (GraphQL) |
-
 ### Discussion Tools (4 tools)
 
 | Tool                        | Description                                                                                                              |
@@ -427,6 +416,14 @@ The plugin provides **81 tools** organized into the following categories:
 | `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)                                               |
 
+### Notes Tools (3 tools)
+
+| Tool                 | Description                                                                                         |
+| -------------------- | --------------------------------------------------------------------------------------------------- |
+| `gitlab_list_notes`  | List all notes/comments on any resource (MRs, issues, epics, snippets) with cursor-based pagination |
+| `gitlab_get_note`    | Get a single note by ID (issues and epics only)                                                     |
+| `gitlab_create_note` | Add a simple comment to any resource (for thread replies, use `gitlab_create_discussion`)           |
+
 ### Audit Event Tools (3 tools)
 
 | Tool                                | Description                                              |
@@ -470,10 +467,11 @@ const issue = await plugin.tool.gitlab_create_issue.execute({
 
 console.log(`Issue created: ${issue.web_url}`);
 
-// Add a comment to the issue
-await plugin.tool.gitlab_create_issue_note.execute({
+// Add a comment to the issue (using unified notes tool)
+await plugin.tool.gitlab_create_note.execute({
+  resource_type: 'issue',
   project_id: 'my-group/my-project',
-  issue_iid: issue.iid,
+  iid: issue.iid,
   body: 'I will start working on this today.',
 });
 
@@ -766,6 +764,7 @@ opencode-gitlab-plugin/
 │   │   ├── pipelines.ts    # Pipeline tool definitions
 │   │   ├── repository.ts   # Repository tool definitions
 │   │   ├── discussions-unified.ts # Unified discussion tools (4 tools)
+│   │   ├── notes-unified.ts # Unified notes tools (3 tools)
 │   │   └── ...             # Other tool definitions
 │   ├── index.ts            # Main plugin entry point
 │   ├── utils.ts            # Utility functions

package/dist/index.js

@@ -2086,33 +2086,6 @@ Returns the list of files changed with their diffs.`,
       return JSON.stringify(changes, 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.
-This is easier to read than discussions which have nested structure.
-
-The response includes pagination information (pageInfo) with cursors for fetching additional pages.
-Use 'after' with the 'endCursor' from pageInfo to get the next page.
-Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
-    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 items to return from the beginning (default: 20, max: 100)"),
-      after: z.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
-      last: z.number().optional().describe("Number of items to return from the end (for backward pagination)"),
-      before: z.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const result = await client.listMrNotes(args.project_id, args.mr_iid, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(result, null, 2);
-    }
-  }),
   gitlab_create_merge_request: tool({
     description: `Create a new merge request.
 Returns the created merge request with all details.`,
@@ -2330,47 +2303,6 @@ Can filter by state, labels, assignee, milestone.`,
       });
       return JSON.stringify(issues, null, 2);
     }
-  }),
-  gitlab_list_issue_notes: tool2({
-    description: `List all notes/comments on an issue using GraphQL API with pagination support.
-Returns all comments including system notes in chronological order.
-
-The response includes pagination information (pageInfo) with cursors for fetching additional pages.
-Use 'after' with the 'endCursor' from pageInfo to get the next page.
-Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
-    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 items to return from the beginning (default: 20, max: 100)"),
-      after: z2.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
-      last: z2.number().optional().describe("Number of items to return from the end (for backward pagination)"),
-      before: z2.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const result = await client.listIssueNotes(args.project_id, args.issue_iid, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(result, 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.
-Useful when you need to retrieve a specific comment without fetching all 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"),
-      note_id: z2.number().describe("The ID of the note to retrieve")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.getIssueNote(args.project_id, args.issue_iid, args.note_id);
-      return JSON.stringify(note, null, 2);
-    }
   })
 };
 
@@ -2514,47 +2446,6 @@ Removes the association between the issue and the epic.`,
       );
       return JSON.stringify(result, null, 2);
     }
-  }),
-  gitlab_list_epic_notes: tool3({
-    description: `List all comments/notes on an epic using GraphQL API with pagination support.
-Returns all comments in chronological order.
-
-The response includes pagination information (pageInfo) with cursors for fetching additional pages.
-Use 'after' with the 'endCursor' from pageInfo to get the next page.
-Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
-    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 items to return from the beginning (default: 20, max: 100)"),
-      after: z3.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
-      last: z3.number().optional().describe("Number of items to return from the end (for backward pagination)"),
-      before: z3.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const result = await client.listEpicNotes(args.group_id, args.epic_iid, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(result, 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.
-Useful when you need to retrieve a specific comment without fetching all notes.`,
-    args: {
-      group_id: z3.string().describe("The group ID or URL-encoded path"),
-      epic_iid: z3.number().describe("The internal ID of the epic"),
-      note_id: z3.number().describe("The ID of the note to retrieve")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const note = await client.getEpicNote(args.group_id, args.epic_iid, args.note_id);
-      return JSON.stringify(note, null, 2);
-    }
   })
 };
 
@@ -3320,43 +3211,11 @@ Requires Developer role or higher.`,
   })
 };
 
-// src/tools/snippets.ts
+// src/tools/todos.ts
 import { tool as tool9 } from "@opencode-ai/plugin";
 var z9 = tool9.schema;
-var snippetTools = {
-  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.
-
-The response includes pagination information (pageInfo) with cursors for fetching additional pages.
-Use 'after' with the 'endCursor' from pageInfo to get the next page.
-Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
-    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 items to return from the beginning (default: 20, max: 100)"),
-      after: z9.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
-      last: z9.number().optional().describe("Number of items to return from the end (for backward pagination)"),
-      before: z9.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
-    },
-    execute: async (args, _ctx) => {
-      const client = getGitLabClient();
-      const result = await client.listSnippetNotes(args.project_id, args.snippet_id, {
-        first: args.first,
-        after: args.after,
-        last: args.last,
-        before: args.before
-      });
-      return JSON.stringify(result, null, 2);
-    }
-  })
-};
-
-// src/tools/todos.ts
-import { tool as tool10 } from "@opencode-ai/plugin";
-var z10 = tool10.schema;
 var todoTools = {
-  gitlab_list_todos: tool10({
+  gitlab_list_todos: tool9({
     description: `List TODO items for the current user using GraphQL API with pagination support.
 Returns a list of pending or done TODO items assigned to the authenticated user.
 TODOs are created when you are assigned to an issue/MR, mentioned in a comment, or when someone requests your review.
@@ -3365,7 +3224,7 @@ The response includes pagination information (pageInfo) with cursors for fetchin
 Use 'after' with the 'endCursor' from pageInfo to get the next page.
 Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
     args: {
-      action: z10.enum([
+      action: z9.enum([
         "assigned",
         "mentioned",
         "build_failed",
@@ -3376,15 +3235,15 @@ Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
         "merge_train_removed",
         "review_requested"
       ]).optional().describe("Filter by action type"),
-      author_id: z10.number().optional().describe("Filter by author ID"),
-      project_id: z10.string().optional().describe("Filter by project ID or path"),
-      group_id: z10.string().optional().describe("Filter by group ID"),
-      state: z10.enum(["pending", "done"]).optional().describe("Filter by state (default: pending)"),
-      type: z10.enum(["Issue", "MergeRequest", "DesignManagement::Design", "Alert", "Epic", "Commit"]).optional().describe("Filter by target type"),
-      first: z10.number().optional().describe("Number of items to return from the beginning (default: 20, max: 100)"),
-      after: z10.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
-      last: z10.number().optional().describe("Number of items to return from the end (for backward pagination)"),
-      before: z10.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
+      author_id: z9.number().optional().describe("Filter by author ID"),
+      project_id: z9.string().optional().describe("Filter by project ID or path"),
+      group_id: z9.string().optional().describe("Filter by group ID"),
+      state: z9.enum(["pending", "done"]).optional().describe("Filter by state (default: pending)"),
+      type: z9.enum(["Issue", "MergeRequest", "DesignManagement::Design", "Alert", "Epic", "Commit"]).optional().describe("Filter by target type"),
+      first: z9.number().optional().describe("Number of items to return from the beginning (default: 20, max: 100)"),
+      after: z9.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
+      last: z9.number().optional().describe("Number of items to return from the end (for backward pagination)"),
+      before: z9.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3403,11 +3262,11 @@ Use 'before' with the 'startCursor' from pageInfo to get the previous page.`,
       return JSON.stringify(result, null, 2);
     }
   }),
-  gitlab_mark_todo_done: tool10({
+  gitlab_mark_todo_done: tool9({
     description: `Mark a specific TODO item as done.
 Use this to mark a single TODO as completed.`,
     args: {
-      todo_id: z10.number().describe("The ID of the TODO item to mark as done")
+      todo_id: z9.number().describe("The ID of the TODO item to mark as done")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3415,7 +3274,7 @@ Use this to mark a single TODO as completed.`,
       return JSON.stringify(result, null, 2);
     }
   }),
-  gitlab_mark_all_todos_done: tool10({
+  gitlab_mark_all_todos_done: tool9({
     description: `Mark all TODO items as done.
 Use this to mark all pending TODOs for the current user as completed.`,
     args: {},
@@ -3425,7 +3284,7 @@ Use this to mark all pending TODOs for the current user as completed.`,
       return JSON.stringify(result, null, 2);
     }
   }),
-  gitlab_get_todo_count: tool10({
+  gitlab_get_todo_count: tool9({
     description: `Get the count of pending TODO items.
 Returns the total number of pending TODOs for the current user.`,
     args: {},
@@ -3438,15 +3297,15 @@ Returns the total number of pending TODOs for the current user.`,
 };
 
 // src/tools/wikis.ts
-import { tool as tool11 } from "@opencode-ai/plugin";
-var z11 = tool11.schema;
+import { tool as tool10 } from "@opencode-ai/plugin";
+var z10 = tool10.schema;
 var wikiTools = {
-  gitlab_get_wiki_page: tool11({
+  gitlab_get_wiki_page: tool10({
     description: `Get a wiki page with its content.
 Returns the wiki page content and metadata.`,
     args: {
-      project_id: z11.string().describe("The project ID or URL-encoded path"),
-      slug: z11.string().describe("The slug (URL-friendly name) of the wiki page")
+      project_id: z10.string().describe("The project ID or URL-encoded path"),
+      slug: z10.string().describe("The slug (URL-friendly name) of the wiki page")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3457,15 +3316,15 @@ Returns the wiki page content and metadata.`,
 };
 
 // src/tools/work-items.ts
-import { tool as tool12 } from "@opencode-ai/plugin";
-var z12 = tool12.schema;
+import { tool as tool11 } from "@opencode-ai/plugin";
+var z11 = tool11.schema;
 var workItemTools = {
-  gitlab_get_work_item: tool12({
+  gitlab_get_work_item: tool11({
     description: `Get a single work item (issue, epic, task, etc.).
 Work items are the new unified model for issues, epics, tasks, and other work tracking items in GitLab.`,
     args: {
-      project_id: z12.string().describe("The project ID or URL-encoded path"),
-      work_item_id: z12.number().describe("The ID of the work item")
+      project_id: z11.string().describe("The project ID or URL-encoded path"),
+      work_item_id: z11.number().describe("The ID of the work item")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3473,17 +3332,17 @@ Work items are the new unified model for issues, epics, tasks, and other work tr
       return JSON.stringify(workItem, null, 2);
     }
   }),
-  gitlab_list_work_items: tool12({
+  gitlab_list_work_items: tool11({
     description: `List work items in a project or group.
 Work items include issues, epics, tasks, and other work tracking items.`,
     args: {
-      project_id: z12.string().optional().describe("The project ID or URL-encoded path"),
-      group_id: z12.string().optional().describe("The group ID or URL-encoded path"),
-      state: z12.enum(["opened", "closed", "all"]).optional().describe("Filter by state (default: opened)"),
-      search: z12.string().optional().describe("Search work items by title or description"),
-      labels: z12.string().optional().describe("Comma-separated list of labels to filter by"),
-      work_item_type: z12.string().optional().describe("Filter by work item type (e.g., 'Issue', 'Epic', 'Task')"),
-      limit: z12.number().optional().describe("Maximum number of results (default: 20)")
+      project_id: z11.string().optional().describe("The project ID or URL-encoded path"),
+      group_id: z11.string().optional().describe("The group ID or URL-encoded path"),
+      state: z11.enum(["opened", "closed", "all"]).optional().describe("Filter by state (default: opened)"),
+      search: z11.string().optional().describe("Search work items by title or description"),
+      labels: z11.string().optional().describe("Comma-separated list of labels to filter by"),
+      work_item_type: z11.string().optional().describe("Filter by work item type (e.g., 'Issue', 'Epic', 'Task')"),
+      limit: z11.number().optional().describe("Maximum number of results (default: 20)")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3499,12 +3358,12 @@ Work items include issues, epics, tasks, and other work tracking items.`,
       return JSON.stringify(workItems, null, 2);
     }
   }),
-  gitlab_get_work_item_notes: tool12({
+  gitlab_get_work_item_notes: tool11({
     description: `Get all comments for a work item.
 Returns all notes/comments on the work item in chronological order.`,
     args: {
-      project_id: z12.string().describe("The project ID or URL-encoded path"),
-      work_item_id: z12.number().describe("The ID of the work item")
+      project_id: z11.string().describe("The project ID or URL-encoded path"),
+      work_item_id: z11.number().describe("The ID of the work item")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3512,16 +3371,16 @@ Returns all notes/comments on the work item in chronological order.`,
       return JSON.stringify(notes, null, 2);
     }
   }),
-  gitlab_create_work_item: tool12({
+  gitlab_create_work_item: tool11({
     description: `Create a new work item (issue, task, etc.).
 Work items are the new unified model for issues, epics, tasks, and other work tracking items.`,
     args: {
-      project_id: z12.string().describe("The project ID or URL-encoded path"),
-      title: z12.string().describe("The title of the work item"),
-      work_item_type_id: z12.number().describe("The ID of the work item type (e.g., 1 for Issue, 2 for Task)"),
-      description: z12.string().optional().describe("The description of the work item (supports Markdown)"),
-      labels: z12.array(z12.string()).optional().describe("Array of label names"),
-      assignee_ids: z12.array(z12.number()).optional().describe("Array of user IDs to assign")
+      project_id: z11.string().describe("The project ID or URL-encoded path"),
+      title: z11.string().describe("The title of the work item"),
+      work_item_type_id: z11.number().describe("The ID of the work item type (e.g., 1 for Issue, 2 for Task)"),
+      description: z11.string().optional().describe("The description of the work item (supports Markdown)"),
+      labels: z11.array(z11.string()).optional().describe("Array of label names"),
+      assignee_ids: z11.array(z11.number()).optional().describe("Array of user IDs to assign")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3535,17 +3394,17 @@ Work items are the new unified model for issues, epics, tasks, and other work tr
       return JSON.stringify(workItem, null, 2);
     }
   }),
-  gitlab_update_work_item: tool12({
+  gitlab_update_work_item: tool11({
     description: `Update an existing work item.
 Can update title, description, state, labels, and assignees.`,
     args: {
-      project_id: z12.string().describe("The project ID or URL-encoded path"),
-      work_item_id: z12.number().describe("The ID of the work item"),
-      title: z12.string().optional().describe("The new title"),
-      description: z12.string().optional().describe("The new description (supports Markdown)"),
-      state_event: z12.enum(["close", "reopen"]).optional().describe("Change the state (close or reopen)"),
-      labels: z12.array(z12.string()).optional().describe("Array of label names"),
-      assignee_ids: z12.array(z12.number()).optional().describe("Array of user IDs to assign")
+      project_id: z11.string().describe("The project ID or URL-encoded path"),
+      work_item_id: z11.number().describe("The ID of the work item"),
+      title: z11.string().optional().describe("The new title"),
+      description: z11.string().optional().describe("The new description (supports Markdown)"),
+      state_event: z11.enum(["close", "reopen"]).optional().describe("Change the state (close or reopen)"),
+      labels: z11.array(z11.string()).optional().describe("Array of label names"),
+      assignee_ids: z11.array(z11.number()).optional().describe("Array of user IDs to assign")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3559,12 +3418,12 @@ Can update title, description, state, labels, and assignees.`,
       return JSON.stringify(workItem, null, 2);
     }
   }),
-  gitlab_create_work_item_note: tool12({
+  gitlab_create_work_item_note: tool11({
     description: `Create a comment on a work item.`,
     args: {
-      project_id: z12.string().describe("The project ID or URL-encoded path"),
-      work_item_id: z12.number().describe("The ID of the work item"),
-      body: z12.string().describe("The content of the note/comment (supports Markdown)")
+      project_id: z11.string().describe("The project ID or URL-encoded path"),
+      work_item_id: z11.number().describe("The ID of the work item"),
+      body: z11.string().describe("The content of the note/comment (supports Markdown)")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3575,17 +3434,17 @@ Can update title, description, state, labels, and assignees.`,
 };
 
 // src/tools/discussions-unified.ts
-import { tool as tool13 } from "@opencode-ai/plugin";
-var z13 = tool13.schema;
-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")
+import { tool as tool12 } from "@opencode-ai/plugin";
+var z12 = tool12.schema;
+var positionSchema = z12.object({
+  base_sha: z12.string().describe("SHA of the base commit"),
+  start_sha: z12.string().describe("SHA of the start commit"),
+  head_sha: z12.string().describe("SHA of the head commit"),
+  position_type: z12.enum(["text", "image"]).describe("Type of position"),
+  old_path: z12.string().optional().describe("Path of the file before changes"),
+  new_path: z12.string().optional().describe("Path of the file after changes"),
+  old_line: z12.number().optional().describe("Line number in the old version"),
+  new_line: z12.number().optional().describe("Line number in the new version")
 });
 function validateResourceParams(resourceType, args) {
   switch (resourceType) {
@@ -3612,7 +3471,7 @@ var discussionsUnifiedTools = {
   /**
    * List discussions for any GitLab resource type
    */
-  gitlab_list_discussions: tool13({
+  gitlab_list_discussions: tool12({
     description: `List discussions (comment threads) on any GitLab resource.
 Supports: merge_requests, issues, epics, commits, snippets.
 
@@ -3628,17 +3487,17 @@ Examples:
 - 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("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)"),
+      resource_type: z12.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("Type of GitLab resource"),
+      project_id: z12.string().optional().describe("Project ID or path. Required for merge_request, issue, commit, snippet"),
+      group_id: z12.string().optional().describe("Group ID or path. Required for epic"),
+      iid: z12.number().optional().describe("Internal ID of the resource (for merge_request, issue, epic)"),
+      sha: z12.string().optional().describe("Commit SHA (required for commit)"),
+      snippet_id: z12.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")
+      first: z12.number().optional().describe("Number of items to return (default: 20)"),
+      after: z12.string().optional().describe("Cursor for pagination - use endCursor from previous response"),
+      before: z12.string().optional().describe("Cursor for backward pagination"),
+      last: z12.number().optional().describe("Number of items from the end")
     },
     execute: async (args, _ctx) => {
       validateResourceParams(args.resource_type, args);
@@ -3692,7 +3551,7 @@ Examples:
   /**
    * Get a specific discussion thread from any GitLab resource
    */
-  gitlab_get_discussion: tool13({
+  gitlab_get_discussion: tool12({
     description: `Get a specific discussion thread with all its replies.
 Returns the discussion with its 'notes' array containing all comments.
 
@@ -3705,13 +3564,13 @@ Required parameters vary by resource type:
 - 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("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)")
+      resource_type: z12.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("Type of GitLab resource"),
+      discussion_id: z12.string().describe("The ID of the discussion thread"),
+      project_id: z12.string().optional().describe("Project ID or path"),
+      group_id: z12.string().optional().describe("Group ID or path (for epic)"),
+      iid: z12.number().optional().describe("Internal ID (for merge_request, issue, epic)"),
+      sha: z12.string().optional().describe("Commit SHA (for commit)"),
+      snippet_id: z12.number().optional().describe("Snippet ID (for snippet)")
     },
     execute: async (args, _ctx) => {
       validateResourceParams(args.resource_type, args);
@@ -3759,7 +3618,7 @@ Required parameters vary by resource type:
   /**
    * Create a new discussion thread or reply to an existing one
    */
-  gitlab_create_discussion: tool13({
+  gitlab_create_discussion: tool12({
     description: `Create a new discussion thread or reply to an existing one.
 
 For NEW discussion: Omit discussion_id
@@ -3772,14 +3631,14 @@ Examples:
 - 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"),
+      resource_type: z12.enum(["merge_request", "issue", "epic", "commit", "snippet"]).describe("Type of GitLab resource"),
+      body: z12.string().describe("The comment text (Markdown supported)"),
+      project_id: z12.string().optional().describe("Project ID or path"),
+      group_id: z12.string().optional().describe("Group ID or path (for epic)"),
+      iid: z12.number().optional().describe("Internal ID (for merge_request, issue, epic)"),
+      sha: z12.string().optional().describe("Commit SHA (for commit)"),
+      snippet_id: z12.number().optional().describe("Snippet ID (for snippet)"),
+      discussion_id: z12.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) => {
@@ -3844,17 +3703,17 @@ Examples:
   /**
    * Resolve or unresolve a discussion thread
    */
-  gitlab_resolve_discussion: tool13({
+  gitlab_resolve_discussion: tool12({
     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")
+      resource_type: z12.enum(["merge_request", "issue"]).describe("Type of resource (only MR and issue discussions can be resolved)"),
+      action: z12.enum(["resolve", "unresolve"]).describe("Whether to resolve or unresolve"),
+      discussion_id: z12.string().describe("The ID of the discussion thread"),
+      project_id: z12.string().describe("Project ID or path"),
+      iid: z12.number().describe("Internal ID of the MR or issue")
     },
     execute: async (args, _ctx) => {
       const client = getGitLabClient();
@@ -3893,6 +3752,224 @@ Use after addressing feedback to indicate the discussion is complete.`,
   })
 };
 
+// src/tools/notes-unified.ts
+import { tool as tool13 } from "@opencode-ai/plugin";
+var z13 = tool13.schema;
+var VALID_LIST_CREATE_TYPES = ["merge_request", "issue", "epic", "snippet"];
+var VALID_GET_NOTE_TYPES = ["issue", "epic"];
+function validationError(param, resourceType) {
+  return new Error(
+    `Missing required parameter: '${param}' is required for resource_type '${resourceType}'`
+  );
+}
+function validateListCreateParams(resourceType, args) {
+  if (!VALID_LIST_CREATE_TYPES.includes(resourceType)) {
+    throw new Error(
+      `Invalid resource_type '${resourceType}'. Must be one of: ${VALID_LIST_CREATE_TYPES.join(", ")}`
+    );
+  }
+  switch (resourceType) {
+    case "merge_request":
+    case "issue":
+      if (!args.project_id) throw validationError("project_id", resourceType);
+      if (args.iid == null) throw validationError("iid", resourceType);
+      break;
+    case "epic":
+      if (!args.group_id) throw validationError("group_id", resourceType);
+      if (args.iid == null) throw validationError("iid", resourceType);
+      break;
+    case "snippet":
+      if (!args.project_id) throw validationError("project_id", resourceType);
+      if (args.snippet_id == null) throw validationError("snippet_id", resourceType);
+      break;
+  }
+}
+function validateGetNoteParams(resourceType, args) {
+  if (!VALID_GET_NOTE_TYPES.includes(resourceType)) {
+    throw new Error(
+      `Invalid resource_type '${resourceType}'. Must be one of: ${VALID_GET_NOTE_TYPES.join(", ")}`
+    );
+  }
+  if (args.note_id == null) throw validationError("note_id", resourceType);
+  switch (resourceType) {
+    case "issue":
+      if (!args.project_id) throw validationError("project_id", resourceType);
+      if (args.iid == null) throw validationError("iid", resourceType);
+      break;
+    case "epic":
+      if (!args.group_id) throw validationError("group_id", resourceType);
+      if (args.iid == null) throw validationError("iid", resourceType);
+      break;
+  }
+}
+var notesUnifiedTools = {
+  /**
+   * List notes/comments for any GitLab resource type
+   */
+  gitlab_list_notes: tool13({
+    description: `List all notes/comments on any GitLab resource using GraphQL API with pagination support.
+Returns all comments including system notes in chronological order.
+This is easier to read than discussions which have nested structure.
+
+The response includes pagination information (pageInfo) with cursors for fetching additional pages.
+Use 'after' with the 'endCursor' from pageInfo to get the next page.
+Use 'before' with the 'startCursor' from pageInfo to get the previous 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
+- Snippet: resource_type="snippet", project_id="group/project", snippet_id=789`,
+    args: {
+      resource_type: z13.enum(["merge_request", "issue", "epic", "snippet"]).describe("Type of GitLab resource"),
+      project_id: z13.string().optional().describe("Project ID or path. Required for merge_request, issue, 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)"),
+      snippet_id: z13.number().optional().describe("Snippet ID (required for snippet)"),
+      // Pagination
+      first: z13.number().optional().describe("Number of items to return from the beginning (default: 20, max: 100)"),
+      after: z13.string().optional().describe("Cursor for forward pagination - use endCursor from previous response"),
+      last: z13.number().optional().describe("Number of items to return from the end (for backward pagination)"),
+      before: z13.string().optional().describe("Cursor for backward pagination - use startCursor from previous response")
+    },
+    execute: async (args, _ctx) => {
+      validateListCreateParams(args.resource_type, args);
+      const client = getGitLabClient();
+      const paginationOptions = {
+        first: args.first,
+        after: args.after,
+        last: args.last,
+        before: args.before
+      };
+      switch (args.resource_type) {
+        case "merge_request":
+          return JSON.stringify(
+            await client.listMrNotes(args.project_id, args.iid, paginationOptions),
+            null,
+            2
+          );
+        case "issue":
+          return JSON.stringify(
+            await client.listIssueNotes(args.project_id, args.iid, paginationOptions),
+            null,
+            2
+          );
+        case "epic":
+          return JSON.stringify(
+            await client.listEpicNotes(args.group_id, args.iid, paginationOptions),
+            null,
+            2
+          );
+        case "snippet":
+          return JSON.stringify(
+            await client.listSnippetNotes(args.project_id, args.snippet_id, paginationOptions),
+            null,
+            2
+          );
+        default:
+          throw new Error(`Unsupported resource type: ${args.resource_type}`);
+      }
+    }
+  }),
+  /**
+   * Get a single note/comment by its ID
+   */
+  gitlab_get_note: tool13({
+    description: `Get a single note/comment from an issue or epic by its ID.
+Returns the full details of a specific note including author, body, timestamps, and metadata.
+Useful when you need to retrieve a specific comment without fetching all notes.
+
+Supports: issues, epics (MR notes use discussions API)
+
+Examples:
+- Issue note: resource_type="issue", project_id="group/project", iid=456, note_id=123
+- Epic note: resource_type="epic", group_id="my-group", iid=1, note_id=456`,
+    args: {
+      resource_type: z13.enum(["issue", "epic"]).describe("Type of GitLab resource (issue or epic only)"),
+      note_id: z13.number().describe("The ID of the note to retrieve"),
+      project_id: z13.string().optional().describe("Project ID or path. Required for issue"),
+      group_id: z13.string().optional().describe("Group ID or path. Required for epic"),
+      iid: z13.number().describe("Internal ID of the issue or epic")
+    },
+    execute: async (args, _ctx) => {
+      validateGetNoteParams(args.resource_type, args);
+      const client = getGitLabClient();
+      switch (args.resource_type) {
+        case "issue":
+          return JSON.stringify(
+            await client.getIssueNote(args.project_id, args.iid, args.note_id),
+            null,
+            2
+          );
+        case "epic":
+          return JSON.stringify(
+            await client.getEpicNote(args.group_id, args.iid, args.note_id),
+            null,
+            2
+          );
+        default:
+          throw new Error(`Unsupported resource type: ${args.resource_type}`);
+      }
+    }
+  }),
+  /**
+   * Create a simple note/comment on any GitLab resource
+   */
+  gitlab_create_note: tool13({
+    description: `Add a simple comment/note to any GitLab resource.
+Creates a standalone comment (not part of a thread).
+
+For replying to existing discussion threads, use gitlab_create_discussion 
+with discussion_id parameter instead.
+
+Examples:
+- MR comment: resource_type="merge_request", project_id="group/project", iid=123, body="LGTM!"
+- Issue comment: resource_type="issue", project_id="group/project", iid=456, body="Working on this"
+- Epic comment: resource_type="epic", group_id="my-group", iid=1, body="Planning complete"
+- Snippet comment: resource_type="snippet", project_id="group/project", snippet_id=789, body="Nice code!"`,
+    args: {
+      resource_type: z13.enum(["merge_request", "issue", "epic", "snippet"]).describe("Type of GitLab resource"),
+      body: z13.string().describe("The content of the note/comment (supports Markdown)"),
+      project_id: z13.string().optional().describe("Project ID or path. Required for merge_request, issue, 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)"),
+      snippet_id: z13.number().optional().describe("Snippet ID (required for snippet)")
+    },
+    execute: async (args, _ctx) => {
+      validateListCreateParams(args.resource_type, args);
+      const client = getGitLabClient();
+      switch (args.resource_type) {
+        case "merge_request":
+          return JSON.stringify(
+            await client.createMrNote(args.project_id, args.iid, args.body),
+            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 "snippet":
+          return JSON.stringify(
+            await client.createSnippetNote(args.project_id, args.snippet_id, args.body),
+            null,
+            2
+          );
+        default:
+          throw new Error(`Unsupported resource type: ${args.resource_type}`);
+      }
+    }
+  })
+};
+
 // src/tools/git.ts
 import { tool as tool14 } from "@opencode-ai/plugin";
 
@@ -4249,8 +4326,6 @@ var gitlabPlugin = async (_input) => {
       ...userTools,
       // Security Tools
       ...securityTools,
-      // Snippet Tools
-      ...snippetTools,
       // TODO Tools
       ...todoTools,
       // Wiki Tools
@@ -4259,6 +4334,8 @@ var gitlabPlugin = async (_input) => {
       ...workItemTools,
       // Unified Discussion Tools (covers MR, issue, epic, commit, snippet discussions)
       ...discussionsUnifiedTools,
+      // Unified Notes Tools (covers MR, issue, epic, snippet notes)
+      ...notesUnifiedTools,
       // Git Tools
       ...gitTools,
       // Audit Tools

package/package.json

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