@atlassian-dc-mcp/bitbucket 0.12.2 → 0.14.0

package/build/pr-comment-mapper.js

@@ -77,6 +77,44 @@ function simplifyComment(comment, ancestorIds = new Set()) {
         state: comment.state
     };
 }
+function filterComment(comment, includeResolved, ancestorIds = new Set()) {
+    if (!includeResolved && comment.threadResolved) {
+        return null;
+    }
+    const nextAncestorIds = new Set(ancestorIds);
+    nextAncestorIds.add(comment.id);
+    const comments = comment.comments
+        .filter(isComment)
+        .filter(childComment => !nextAncestorIds.has(childComment.id))
+        .map(childComment => filterComment(childComment, includeResolved, nextAncestorIds))
+        .filter((childComment) => childComment !== null);
+    return {
+        ...comment,
+        comments,
+    };
+}
+export function filterPullRequestComments(response, options = {}) {
+    const includeResolved = options.includeResolved ?? false;
+    if (includeResolved) {
+        return response;
+    }
+    return {
+        ...response,
+        values: (response.values || []).flatMap(activity => {
+            if (!isPRActivity(activity) || activity.action !== 'COMMENTED' || !activity.comment || !isComment(activity.comment)) {
+                return [activity];
+            }
+            const filteredComment = filterComment(activity.comment, includeResolved);
+            if (!filteredComment) {
+                return [];
+            }
+            return [{
+                    ...activity,
+                    comment: filteredComment,
+                }];
+        })
+    };
+}
 function simplifyActivity(activity) {
     return {
         id: activity.id,
@@ -89,18 +127,19 @@ function simplifyActivity(activity) {
         })
     };
 }
-export function simplifyBitbucketPRComments(response) {
+export function simplifyBitbucketPRComments(response, options = {}) {
+    const filteredResponse = filterPullRequestComments(response, options);
     const activities = [];
     // Process each activity with type guard validation
-    for (const activity of response.values || []) {
+    for (const activity of filteredResponse.values || []) {
         if (isPRActivity(activity)) {
             activities.push(simplifyActivity(activity));
         }
         // If type guard fails, we skip the invalid activity but continue processing
     }
     // If no valid activities were found, return the original response
-    if (activities.length === 0 && (response.values || []).length > 0) {
-        return response;
+    if (activities.length === 0 && (filteredResponse.values || []).length > 0) {
+        return filteredResponse;
     }
     // Find PR author (usually the one who OPENED the PR)
     const prAuthor = activities.find(a => a.action === 'OPENED')?.user;
@@ -108,7 +147,7 @@ export function simplifyBitbucketPRComments(response) {
     const comments = activities.filter(a => a.action === 'COMMENTED' && a.comment);
     const unresolvedCount = comments.filter(a => a.comment && !a.comment.threadResolved).length;
     return {
-        isLastPage: response.isLastPage ?? true,
+        isLastPage: filteredResponse.isLastPage ?? true,
         activities,
         summary: {
             totalActivities: activities.length,
@@ -118,9 +157,10 @@ export function simplifyBitbucketPRComments(response) {
         }
     };
 }
-export function getCommentSummary(response) {
+export function getCommentSummary(response, options = {}) {
+    const filteredResponse = filterPullRequestComments(response, options);
     const commentSummaries = [];
-    for (const activity of response.values || []) {
+    for (const activity of filteredResponse.values || []) {
         // Use type guard to validate activity structure
         if (isPRActivity(activity) && activity.action === 'COMMENTED' && activity.comment) {
             // Additional validation for comment structure

package/build/pr-comment-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"pr-comment-mapper.js","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pr-comment-mapper.js","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlassian-dc-mcp/bitbucket",
-  "version": "0.12.2",
+  "version": "0.14.0",
   "main": "build/index.js",
   "type": "module",
   "bin": "./bin/run.js",
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@atlassian-dc-mcp/common": "^0.12.2",
+    "@atlassian-dc-mcp/common": "^0.14.0",
     "@modelcontextprotocol/sdk": "^1.27.1",
     "dotenv": "^16.4.7",
     "node-fetch": "^3.3.2",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6488590c1832714d510cc4a4f5f3d9e8e38f3b09"
+  "gitHead": "cddfcbf3cb1404e69957277fd988c28e08700fae"
 }

package/server.json

@@ -18,22 +18,29 @@
       },
       "environmentVariables": [
         {
-          "description": "Bitbucket host domain (e.g. your-instance.atlassian.net)",
+          "description": "Absolute path to a shared dotenv-style config file. When set, values are read from this file before direct environment variable overrides are applied.",
+          "isRequired": false,
+          "format": "string",
+          "isSecret": false,
+          "name": "ATLASSIAN_DC_MCP_CONFIG_FILE"
+        },
+        {
+          "description": "Bitbucket host domain (e.g. your-instance.atlassian.net). Required unless provided through ATLASSIAN_DC_MCP_CONFIG_FILE or BITBUCKET_API_BASE_PATH.",
           "isRequired": false,
           "format": "string",
           "isSecret": false,
           "name": "BITBUCKET_HOST"
         },
         {
-          "description": "Bitbucket API base path (alternative to BITBUCKET_HOST)",
+          "description": "Bitbucket API base path (alternative to BITBUCKET_HOST). Required unless provided through ATLASSIAN_DC_MCP_CONFIG_FILE or BITBUCKET_HOST.",
           "isRequired": false,
           "format": "string",
           "isSecret": false,
           "name": "BITBUCKET_API_BASE_PATH"
         },
         {
-          "description": "Bitbucket Personal Access Token or API token",
-          "isRequired": true,
+          "description": "Bitbucket Personal Access Token or API token. Required unless provided through ATLASSIAN_DC_MCP_CONFIG_FILE.",
+          "isRequired": false,
           "format": "string",
           "isSecret": true,
           "name": "BITBUCKET_API_TOKEN"

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

@@ -1,3 +1,7 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { initializeRuntimeConfig } from '@atlassian-dc-mcp/common';
 import { BitbucketService } from '../bitbucket-service.js';
 import { PullRequestsService } from '../bitbucket-client/index.js';
 import { request as mockRequest } from '../bitbucket-client/core/request.js';
@@ -709,7 +713,10 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockComment);
+      expect(result.data).toEqual({
+        id: 12345,
+        pending: false,
+      });
       expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -735,7 +742,10 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockComment);
+      expect(result.data).toEqual({
+        id: 12346,
+        pending: false,
+      });
       expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -765,7 +775,10 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockComment);
+      expect(result.data).toEqual({
+        id: 12347,
+        pending: false,
+      });
       expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -800,7 +813,10 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockComment);
+      expect(result.data).toEqual({
+        id: 12348,
+        pending: false,
+      });
       expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -982,7 +998,15 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockPullRequest);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 0,
+        title: 'Test PR',
+        state: 'OPEN',
+        fromRefId: 'refs/heads/feature-branch',
+        toRefId: 'refs/heads/main',
+        reviewerCount: 0,
+      });
       expect(PullRequestsService.create).toHaveBeenCalledWith(
         mockProjectKey,
         mockRepositorySlug,
@@ -1040,7 +1064,15 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockPullRequest);
+      expect(result.data).toEqual({
+        id: 2,
+        version: 0,
+        title: 'Test PR without description',
+        state: 'OPEN',
+        fromRefId: 'refs/heads/feature-branch',
+        toRefId: 'refs/heads/main',
+        reviewerCount: 0,
+      });
       expect(PullRequestsService.create).toHaveBeenCalledWith(
         mockProjectKey,
         mockRepositorySlug,
@@ -1090,7 +1122,15 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockPullRequest);
+      expect(result.data).toEqual({
+        id: 3,
+        version: 0,
+        title: 'Test PR with reviewers',
+        state: 'OPEN',
+        fromRefId: 'refs/heads/feature-branch',
+        toRefId: 'refs/heads/main',
+        reviewerCount: 2,
+      });
       expect(PullRequestsService.create).toHaveBeenCalledWith(
         mockProjectKey,
         mockRepositorySlug,
@@ -1172,7 +1212,13 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockUpdatedPR);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 1,
+        title: 'Updated Title',
+        state: 'OPEN',
+        reviewerCount: 0,
+      });
       expect(PullRequestsService.update).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -1204,7 +1250,13 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockUpdatedPR);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 1,
+        title: 'Original Title',
+        state: 'OPEN',
+        reviewerCount: 0,
+      });
       expect(PullRequestsService.update).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -1236,7 +1288,13 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockUpdatedPR);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 1,
+        title: 'Updated Title',
+        state: 'OPEN',
+        reviewerCount: 0,
+      });
       expect(PullRequestsService.update).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -1275,7 +1333,13 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockUpdatedPR);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 1,
+        title: 'Test PR',
+        state: 'OPEN',
+        reviewerCount: 3,
+      });
       expect(PullRequestsService.update).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -1316,7 +1380,13 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockUpdatedPR);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 2,
+        title: 'Updated Title',
+        state: 'OPEN',
+        reviewerCount: 2,
+      });
       expect(PullRequestsService.update).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -1351,7 +1421,13 @@ describe('BitbucketService', () => {
       );
 
       expect(result.success).toBe(true);
-      expect(result.data).toBe(mockUpdatedPR);
+      expect(result.data).toEqual({
+        id: 1,
+        version: 1,
+        title: 'Original Title',
+        state: 'OPEN',
+        reviewerCount: 0,
+      });
       expect(PullRequestsService.update).toHaveBeenCalledWith(
         mockProjectKey,
         mockPullRequestId,
@@ -1510,7 +1586,7 @@ describe('BitbucketService', () => {
   describe('getDashboardPullRequests', () => {
     const { request: mockRequest } = require('../bitbucket-client/core/request.js');
 
-    it('should default to AUTHOR role and limit of 10', async () => {
+    it('should default to AUTHOR role and the package page size', async () => {
       const mockData = {
         values: [
           { id: 1, title: 'PR 1', state: 'OPEN' },
@@ -1536,7 +1612,7 @@ describe('BitbucketService', () => {
             'closedSince': undefined,
             'order': 'NEWEST',
             'start': undefined,
-            'limit': 10,
+            'limit': 25,
           },
           errors: {
             401: 'The currently authenticated user is not permitted to access the dashboard.',
@@ -1612,7 +1688,7 @@ describe('BitbucketService', () => {
             'closedSince': closedSince,
             'order': 'NEWEST',
             'start': undefined,
-            'limit': 10,
+            'limit': 25,
           },
           errors: {
             401: 'The currently authenticated user is not permitted to access the dashboard.',
@@ -1732,10 +1808,17 @@ describe('BitbucketService', () => {
 
   describe('validateConfig', () => {
     const originalEnv = process.env;
+    let tempDir: string;
 
     beforeEach(() => {
-      jest.resetModules();
       process.env = { ...originalEnv };
+      delete process.env.ATLASSIAN_DC_MCP_CONFIG_FILE;
+      tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'bitbucket-validate-config-'));
+      initializeRuntimeConfig({ cwd: tempDir });
+    });
+
+    afterEach(() => {
+      fs.rmSync(tempDir, { recursive: true, force: true });
     });
 
     afterAll(() => {
@@ -1775,6 +1858,15 @@ describe('BitbucketService', () => {
       const missingVars = BitbucketService.validateConfig();
       expect(missingVars).toEqual([]);
     });
+
+    it('should accept required config from the shared config file', () => {
+      const sharedConfigPath = path.join(tempDir, 'shared.env');
+      fs.writeFileSync(sharedConfigPath, 'BITBUCKET_HOST=file-host\nBITBUCKET_API_TOKEN=file-token\n');
+      process.env.ATLASSIAN_DC_MCP_CONFIG_FILE = sharedConfigPath;
+
+      const missingVars = BitbucketService.validateConfig();
+      expect(missingVars).toEqual([]);
+    });
   });
 
   describe('postPullRequestComment - pending flag', () => {