@atlassian-dc-mcp/jira 0.33.0 → 0.35.0

package/src/__tests__/jira-download.test.ts

@@ -9,7 +9,7 @@ jest.mock('../jira-client/index.js', () => ({
     getAttachment: jest.fn(),
   },
   IssueService: {
-    getIssue: jest.fn(),
+    getIssue1: jest.fn(),
   },
   MyselfService: {},
   SearchService: {},
@@ -58,7 +58,7 @@ describe('JiraService.downloadAttachments', () => {
   });
 
   it('downloads all attachments on an issue', async () => {
-    (IssueService.getIssue as jest.Mock).mockResolvedValue({
+    (IssueService.getIssue1 as jest.Mock).mockResolvedValue({
       fields: {
         attachment: [
           { id: '1', filename: 'a.txt', content: 'https://test-host/a' },
@@ -70,13 +70,13 @@ describe('JiraService.downloadAttachments', () => {
 
     const result = await service.downloadAttachments({ issueKey: 'PROJ-1', downloadSide: DISABLED_DOWNLOAD });
 
-    expect(IssueService.getIssue).toHaveBeenCalledWith('PROJ-1', undefined, ['attachment']);
+    expect(IssueService.getIssue1).toHaveBeenCalledWith('PROJ-1', undefined, 'attachment');
     expect(result.success).toBe(true);
     expect(result.data!.count).toBe(2);
   });
 
   it('filters issue attachments by filename', async () => {
-    (IssueService.getIssue as jest.Mock).mockResolvedValue({
+    (IssueService.getIssue1 as jest.Mock).mockResolvedValue({
       fields: {
         attachment: [
           { id: '1', filename: 'a.txt', content: 'https://test-host/a' },
@@ -101,7 +101,7 @@ describe('JiraService.downloadAttachments', () => {
   });
 
   it('fails when an issue has no matching attachment', async () => {
-    (IssueService.getIssue as jest.Mock).mockResolvedValue({ fields: { attachment: [] } });
+    (IssueService.getIssue1 as jest.Mock).mockResolvedValue({ fields: { attachment: [] } });
 
     const result = await service.downloadAttachments({ issueKey: 'PROJ-1', filename: 'x.txt', downloadSide: DISABLED_DOWNLOAD });
 

package/src/__tests__/jira-service.test.ts

@@ -3,7 +3,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { initializeRuntimeConfig } from '@atlassian-dc-mcp/common';
 import { JiraService } from '../jira-service.js';
-import { IssueLinkService, IssueLinkTypeService, IssueService, OpenAPI, SearchService } from '../jira-client/index.js';
+import { IssueLinkService, IssueLinkTypeService, IssueService, MyselfService, OpenAPI, SearchService } from '../jira-client/index.js';
 import { request as __request } from '../jira-client/core/request.js';
 
 jest.mock('../jira-client/core/request.js', () => ({
@@ -14,12 +14,14 @@ jest.mock('../jira-client/index.js', () => ({
   IssueService: {
     getTransitions: jest.fn(),
     doTransition: jest.fn(),
-    getIssue: jest.fn(),
+    getIssue1: jest.fn(),
     editIssue: jest.fn(),
     createIssue: jest.fn(),
     getComments: jest.fn(),
     addComment: jest.fn(),
     updateComment: jest.fn(),
+    addWatcher1: jest.fn(),
+    removeWatcher1: jest.fn(),
   },
   SearchService: {
     searchUsingSearchRequest: jest.fn(),
@@ -31,6 +33,9 @@ jest.mock('../jira-client/index.js', () => ({
   IssueLinkTypeService: {
     getIssueLinkTypes: jest.fn(),
   },
+  MyselfService: {
+    getUser: jest.fn(),
+  },
   OpenAPI: {
     BASE: '',
     TOKEN: '',
@@ -149,33 +154,25 @@ describe('JiraService', () => {
 
     it('uses the richer default field profile for single issue reads', async () => {
       const mockIssue = { key: mockIssueKey };
-      (IssueService.getIssue as jest.Mock).mockResolvedValue(mockIssue);
+      (IssueService.getIssue1 as jest.Mock).mockResolvedValue(mockIssue);
 
       const result = await jiraService.getIssue(mockIssueKey);
 
       expect(result.success).toBe(true);
       expect(result.data).toBe(mockIssue);
-      expect(IssueService.getIssue).toHaveBeenCalledWith(mockIssueKey, undefined, [
-        'summary',
-        'description',
-        'status',
-        'assignee',
-        'reporter',
-        'priority',
-        'issuetype',
-        'labels',
-        'updated',
-        'parent',
-        'subtasks',
-      ]);
+      expect(IssueService.getIssue1).toHaveBeenCalledWith(
+        mockIssueKey,
+        undefined,
+        'summary,description,status,assignee,reporter,priority,issuetype,labels,updated,parent,subtasks',
+      );
     });
 
     it('honors explicit issue fields', async () => {
-      (IssueService.getIssue as jest.Mock).mockResolvedValue({ key: mockIssueKey });
+      (IssueService.getIssue1 as jest.Mock).mockResolvedValue({ key: mockIssueKey });
 
       await jiraService.getIssue(mockIssueKey, 'renderedFields', ['summary', 'status']);
 
-      expect(IssueService.getIssue).toHaveBeenCalledWith(mockIssueKey, 'renderedFields', ['summary', 'status']);
+      expect(IssueService.getIssue1).toHaveBeenCalledWith(mockIssueKey, 'renderedFields', 'summary,status');
     });
 
     it('uses the package default page size for issue comments', async () => {
@@ -223,14 +220,14 @@ describe('JiraService', () => {
   describe('getIssueDevelopmentInfo', () => {
     it('resolves the numeric issue id then requests pull requests by default', async () => {
       const mockDevInfo = { detail: [{ pullRequests: [] }] };
-      (IssueService.getIssue as jest.Mock).mockResolvedValue({ id: '1314681', key: mockIssueKey });
+      (IssueService.getIssue1 as jest.Mock).mockResolvedValue({ id: '1314681', key: mockIssueKey });
       (__request as jest.Mock).mockResolvedValue(mockDevInfo);
 
       const result = await jiraService.getIssueDevelopmentInfo(mockIssueKey);
 
       expect(result.success).toBe(true);
       expect(result.data).toBe(mockDevInfo);
-      expect(IssueService.getIssue).toHaveBeenCalledWith(mockIssueKey, undefined, ['id']);
+      expect(IssueService.getIssue1).toHaveBeenCalledWith(mockIssueKey, undefined, 'id');
       expect(__request).toHaveBeenCalledWith(OpenAPI, {
         method: 'GET',
         url: '/dev-status/1.0/issue/detail',
@@ -239,7 +236,7 @@ describe('JiraService', () => {
     });
 
     it('honors explicit dataType and applicationType', async () => {
-      (IssueService.getIssue as jest.Mock).mockResolvedValue({ id: '42' });
+      (IssueService.getIssue1 as jest.Mock).mockResolvedValue({ id: '42' });
       (__request as jest.Mock).mockResolvedValue({});
 
       await jiraService.getIssueDevelopmentInfo(mockIssueKey, 'repository', 'github');
@@ -252,7 +249,7 @@ describe('JiraService', () => {
     });
 
     it('fails without calling dev-status when the numeric id is missing', async () => {
-      (IssueService.getIssue as jest.Mock).mockResolvedValue({ key: mockIssueKey });
+      (IssueService.getIssue1 as jest.Mock).mockResolvedValue({ key: mockIssueKey });
 
       const result = await jiraService.getIssueDevelopmentInfo(mockIssueKey);
 
@@ -262,7 +259,7 @@ describe('JiraService', () => {
     });
 
     it('surfaces dev-status request errors', async () => {
-      (IssueService.getIssue as jest.Mock).mockResolvedValue({ id: '1314681' });
+      (IssueService.getIssue1 as jest.Mock).mockResolvedValue({ id: '1314681' });
       (__request as jest.Mock).mockRejectedValue(new Error('View Development Tools permission required'));
 
       const result = await jiraService.getIssueDevelopmentInfo(mockIssueKey);
@@ -554,4 +551,56 @@ describe('JiraService', () => {
       expect(result.error).toBe('Invalid issue link id');
     });
   });
+
+  describe('watchIssue', () => {
+    it('should add the calling user as a watcher', async () => {
+      (IssueService.addWatcher1 as jest.Mock).mockResolvedValue(undefined);
+
+      const result = await jiraService.watchIssue(mockIssueKey);
+
+      expect(result.success).toBe(true);
+      // No userName is passed — the API defaults to the authenticated caller.
+      expect(IssueService.addWatcher1).toHaveBeenCalledWith(mockIssueKey);
+    });
+
+    it('should handle API errors gracefully', async () => {
+      (IssueService.addWatcher1 as jest.Mock).mockRejectedValue(new Error('Issue does not exist'));
+
+      const result = await jiraService.watchIssue(mockIssueKey);
+
+      expect(result.success).toBe(false);
+      expect(result.error).toBe('Issue does not exist');
+    });
+  });
+
+  describe('unwatchIssue', () => {
+    it('should remove the calling user as a watcher', async () => {
+      (MyselfService.getUser as jest.Mock).mockResolvedValue({ name: 'jdoe' });
+      (IssueService.removeWatcher1 as jest.Mock).mockResolvedValue(undefined);
+
+      const result = await jiraService.unwatchIssue(mockIssueKey);
+
+      expect(result.success).toBe(true);
+      expect(IssueService.removeWatcher1).toHaveBeenCalledWith(mockIssueKey, 'jdoe');
+    });
+
+    it('should fail if the current user name cannot be resolved', async () => {
+      (MyselfService.getUser as jest.Mock).mockResolvedValue({});
+
+      const result = await jiraService.unwatchIssue(mockIssueKey);
+
+      expect(result.success).toBe(false);
+      expect(IssueService.removeWatcher1).not.toHaveBeenCalled();
+    });
+
+    it('should handle API errors gracefully', async () => {
+      (MyselfService.getUser as jest.Mock).mockResolvedValue({ name: 'jdoe' });
+      (IssueService.removeWatcher1 as jest.Mock).mockRejectedValue(new Error('Issue does not exist'));
+
+      const result = await jiraService.unwatchIssue(mockIssueKey);
+
+      expect(result.success).toBe(false);
+      expect(result.error).toBe('Issue does not exist');
+    });
+  });
 });

package/src/index.ts

@@ -157,6 +157,26 @@ server.tool(
   }
 );
 
+server.tool(
+  "jira_watchIssue",
+  `Add yourself (the authenticated user) as a watcher on a JIRA issue in the ${jiraInstanceType}. Only the calling user can be added; there is no way to watch on behalf of someone else.`,
+  jiraToolSchemas.watchIssue,
+  async ({ issueKey }) => {
+    const result = await jiraService.watchIssue(issueKey);
+    return formatToolResponse(result);
+  }
+);
+
+server.tool(
+  "jira_unwatchIssue",
+  `Remove yourself (the authenticated user) as a watcher from a JIRA issue in the ${jiraInstanceType}. Only the calling user can be removed; there is no way to unwatch on behalf of someone else.`,
+  jiraToolSchemas.unwatchIssue,
+  async ({ issueKey }) => {
+    const result = await jiraService.unwatchIssue(issueKey);
+    return formatToolResponse(result);
+  }
+);
+
 const attachmentGateway = resolveAttachmentGateway(JIRA_PRODUCT);
 
 // Filesystem-reading upload is only registered when the operator explicitly enables it.

package/src/jira-service.ts

@@ -74,7 +74,7 @@ export class JiraService {
 
   async getIssue(issueKey: string, expand?: string, fields?: string[]) {
     return handleApiOperation(
-      () => IssueService.getIssue(issueKey, expand, toIssueFieldSelection(fields ?? DEFAULT_ISSUE_FIELDS)),
+      () => IssueService.getIssue1(issueKey, expand, (fields ?? DEFAULT_ISSUE_FIELDS).join(',')),
       'Error getting issue'
     );
   }
@@ -171,7 +171,7 @@ export class JiraService {
 
   private async resolveIssueId(issueKey: string): Promise<string> {
     // The dev-status API is keyed by the numeric issue id, not the issue key.
-    const issue = await IssueService.getIssue(issueKey, undefined, toIssueFieldSelection(['id']));
+    const issue = await IssueService.getIssue1(issueKey, undefined, 'id');
     if (!issue?.id) {
       throw new Error(`Could not resolve numeric id for issue ${issueKey}`);
     }
@@ -283,7 +283,7 @@ export class JiraService {
     if (!params.issueKey) {
       throw new Error('Either attachmentId or issueKey must be provided');
     }
-    const issue = await IssueService.getIssue(params.issueKey, undefined, toIssueFieldSelection(['attachment']));
+    const issue = await IssueService.getIssue1(params.issueKey, undefined, 'attachment');
     const all = (((issue as any)?.fields?.attachment) ?? []) as Array<Record<string, any>>;
     const filtered = params.filename ? all.filter((a) => a?.filename === params.filename) : all;
     if (filtered.length === 0) {
@@ -326,6 +326,22 @@ export class JiraService {
     );
   }
 
+  // Only the calling user can be (un)watched — the API supports an arbitrary userName,
+  // but exposing that would let the tool subscribe/unsubscribe other users.
+  async watchIssue(issueKey: string) {
+    return handleApiOperation(() => IssueService.addWatcher1(issueKey), 'Error watching issue');
+  }
+
+  async unwatchIssue(issueKey: string) {
+    return handleApiOperation(async () => {
+      const { name } = await MyselfService.getUser();
+      if (!name) {
+        throw new Error('Could not resolve current user name');
+      }
+      return IssueService.removeWatcher1(issueKey, name);
+    }, 'Error unwatching issue');
+  }
+
   async validateSetup(): Promise<void> {
     await MyselfService.getUser();
   }
@@ -416,5 +432,11 @@ export const jiraToolSchemas = {
   },
   unlinkIssues: {
     linkId: z.string().describe("The id of the issue link to delete. Link ids can be found in the 'issuelinks' field of an issue (retrieve it via jira_getIssue with the 'issuelinks' field).")
+  },
+  watchIssue: {
+    issueKey: z.string().describe("JIRA issue key (e.g., PROJ-123)")
+  },
+  unwatchIssue: {
+    issueKey: z.string().describe("JIRA issue key (e.g., PROJ-123)")
   }
 };