@atlassian-dc-mcp/bitbucket 0.12.2 → 0.14.0

package/build/__tests__/bitbucket-token-optimization.test.js

@@ -0,0 +1,375 @@
+import { BitbucketService } from '../bitbucket-service.js';
+import { PullRequestsService } from '../bitbucket-client/index.js';
+jest.mock('../bitbucket-client/index.js', () => ({
+    PullRequestsService: {
+        getActivities: jest.fn(),
+        streamChanges1: jest.fn(),
+        createComment2: jest.fn(),
+        create: jest.fn(),
+        update: jest.fn(),
+    },
+    ProjectService: {},
+    RepositoryService: {},
+    OpenAPI: {
+        BASE: '',
+        TOKEN: '',
+        VERSION: '',
+    },
+}));
+function createUser(name, displayName) {
+    return {
+        name,
+        emailAddress: `${name}@example.com`,
+        active: true,
+        displayName,
+        id: 1,
+        slug: name,
+        type: 'NORMAL',
+        links: {
+            self: [{ href: `https://bitbucket.example.com/users/${name}` }],
+        },
+    };
+}
+function createComment(overrides = {}) {
+    return {
+        properties: { repositoryId: 1 },
+        id: 101,
+        version: 1,
+        text: 'Looks good',
+        author: createUser('reviewer', 'Reviewer'),
+        createdDate: 20,
+        updatedDate: 21,
+        comments: [],
+        anchor: {
+            fromHash: 'abc',
+            toHash: 'def',
+            line: 10,
+            lineType: 'ADDED',
+            fileType: 'TO',
+            path: 'src/app.ts',
+            diffType: 'EFFECTIVE',
+            orphaned: false,
+        },
+        threadResolved: false,
+        severity: 'NORMAL',
+        state: 'OPEN',
+        permittedOperations: {
+            editable: true,
+            transitionable: true,
+            deletable: true,
+        },
+        ...overrides,
+    };
+}
+describe('BitbucketService token optimization paths', () => {
+    let service;
+    beforeEach(() => {
+        service = new BitbucketService('test-host', 'test-token');
+        jest.clearAllMocks();
+    });
+    describe('getPullRequestCommentsAndActions', () => {
+        const mockActivityResponse = {
+            isLastPage: false,
+            values: [
+                {
+                    id: 1,
+                    createdDate: 10,
+                    user: createUser('author', 'Author'),
+                    action: 'OPENED',
+                },
+                {
+                    id: 2,
+                    createdDate: 20,
+                    user: createUser('reviewer', 'Reviewer'),
+                    action: 'COMMENTED',
+                    comment: createComment(),
+                },
+            ],
+        };
+        it('returns compact output by default', async () => {
+            PullRequestsService.getActivities.mockResolvedValue(mockActivityResponse);
+            const result = await service.getPullRequestCommentsAndActions('TEST', 'repo', '123');
+            expect(result.success).toBe(true);
+            expect(result.data).toEqual({
+                isLastPage: false,
+                activities: [
+                    {
+                        id: 1,
+                        createdDate: 10,
+                        user: { name: 'author', displayName: 'Author' },
+                        action: 'OPENED',
+                    },
+                    {
+                        id: 2,
+                        createdDate: 20,
+                        user: { name: 'reviewer', displayName: 'Reviewer' },
+                        action: 'COMMENTED',
+                        comment: {
+                            id: 101,
+                            text: 'Looks good',
+                            author: { name: 'reviewer', displayName: 'Reviewer' },
+                            createdDate: 20,
+                            anchor: {
+                                line: 10,
+                                path: 'src/app.ts',
+                                fileType: 'TO',
+                            },
+                            comments: [],
+                            threadResolved: false,
+                            state: 'OPEN',
+                        },
+                    },
+                ],
+                summary: {
+                    totalActivities: 2,
+                    prAuthor: { name: 'author', displayName: 'Author' },
+                    commentCount: 1,
+                    unresolvedCount: 1,
+                },
+            });
+            expect(PullRequestsService.getActivities).toHaveBeenCalledWith('TEST', '123', 'repo', undefined, undefined, undefined, 25);
+        });
+        it('skips resolved threads by default and includes them on request', async () => {
+            const resolvedActivityResponse = {
+                isLastPage: true,
+                values: [
+                    {
+                        id: 1,
+                        createdDate: 10,
+                        user: createUser('author', 'Author'),
+                        action: 'OPENED',
+                    },
+                    {
+                        id: 2,
+                        createdDate: 20,
+                        user: createUser('reviewer', 'Reviewer'),
+                        action: 'COMMENTED',
+                        comment: createComment({
+                            id: 202,
+                            text: 'Resolved comment',
+                            threadResolved: true,
+                            comments: [createComment({ id: 203, text: 'Resolved reply', anchor: undefined, threadResolved: true })],
+                        }),
+                    },
+                ],
+            };
+            PullRequestsService.getActivities.mockResolvedValue(resolvedActivityResponse);
+            const defaultResult = await service.getPullRequestCommentsAndActions('TEST', 'repo', '123');
+            const includeResolvedResult = await service.getPullRequestCommentsAndActions('TEST', 'repo', '123', undefined, undefined, 'compact', true);
+            expect(defaultResult.success).toBe(true);
+            expect(defaultResult.data).toEqual({
+                isLastPage: true,
+                activities: [
+                    {
+                        id: 1,
+                        createdDate: 10,
+                        user: { name: 'author', displayName: 'Author' },
+                        action: 'OPENED',
+                    },
+                ],
+                summary: {
+                    totalActivities: 1,
+                    prAuthor: { name: 'author', displayName: 'Author' },
+                    commentCount: 0,
+                    unresolvedCount: 0,
+                },
+            });
+            expect(includeResolvedResult.success).toBe(true);
+            expect(includeResolvedResult.data).toEqual({
+                isLastPage: true,
+                activities: [
+                    {
+                        id: 1,
+                        createdDate: 10,
+                        user: { name: 'author', displayName: 'Author' },
+                        action: 'OPENED',
+                    },
+                    {
+                        id: 2,
+                        createdDate: 20,
+                        user: { name: 'reviewer', displayName: 'Reviewer' },
+                        action: 'COMMENTED',
+                        comment: {
+                            id: 202,
+                            text: 'Resolved comment',
+                            author: { name: 'reviewer', displayName: 'Reviewer' },
+                            createdDate: 20,
+                            anchor: {
+                                line: 10,
+                                path: 'src/app.ts',
+                                fileType: 'TO',
+                            },
+                            comments: [
+                                {
+                                    id: 203,
+                                    text: 'Resolved reply',
+                                    author: { name: 'reviewer', displayName: 'Reviewer' },
+                                    createdDate: 20,
+                                    comments: [],
+                                    threadResolved: true,
+                                    state: 'OPEN',
+                                },
+                            ],
+                            threadResolved: true,
+                            state: 'OPEN',
+                        },
+                    },
+                ],
+                summary: {
+                    totalActivities: 2,
+                    prAuthor: { name: 'author', displayName: 'Author' },
+                    commentCount: 1,
+                    unresolvedCount: 0,
+                },
+            });
+        });
+        it('returns summary output when requested', async () => {
+            PullRequestsService.getActivities.mockResolvedValue(mockActivityResponse);
+            const result = await service.getPullRequestCommentsAndActions('TEST', 'repo', '123', 5, 10, 'summary');
+            expect(result.success).toBe(true);
+            expect(result.data).toEqual({
+                isLastPage: false,
+                summary: {
+                    totalActivities: 2,
+                    prAuthor: { name: 'author', displayName: 'Author' },
+                    commentCount: 1,
+                    unresolvedCount: 1,
+                },
+                items: ['Reviewer on src/app.ts:10: Looks good'],
+            });
+            expect(PullRequestsService.getActivities).toHaveBeenCalledWith('TEST', '123', 'repo', undefined, undefined, 5, 10);
+        });
+        it('returns the raw payload when output is full', async () => {
+            PullRequestsService.getActivities.mockResolvedValue(mockActivityResponse);
+            const result = await service.getPullRequestCommentsAndActions('TEST', 'repo', '123', undefined, undefined, 'full');
+            expect(result.success).toBe(true);
+            expect(result.data).toStrictEqual(mockActivityResponse);
+        });
+    });
+    describe('getPullRequestChanges', () => {
+        const mockChangesResponse = {
+            fromHash: 'abc',
+            toHash: 'def',
+            properties: { changeScope: 'ALL' },
+            values: [
+                {
+                    contentId: 'content-1',
+                    fromContentId: 'from-content-1',
+                    path: {
+                        components: ['src', 'app.ts'],
+                        parent: 'src',
+                        name: 'app.ts',
+                        extension: 'ts',
+                        toString: 'src/app.ts',
+                    },
+                    type: 'MODIFY',
+                    properties: {
+                        gitChangeType: 'MODIFY',
+                        activeComments: 2,
+                    },
+                },
+            ],
+            size: 1,
+            isLastPage: true,
+            start: 0,
+            limit: 25,
+            nextPageStart: null,
+        };
+        it('returns compact output by default', async () => {
+            PullRequestsService.streamChanges1.mockResolvedValue(mockChangesResponse);
+            const result = await service.getPullRequestChanges('TEST', 'repo', '123');
+            expect(result.success).toBe(true);
+            expect(result.data).toEqual({
+                fromHash: 'abc',
+                toHash: 'def',
+                changeScope: 'ALL',
+                changes: [
+                    {
+                        contentId: 'content-1',
+                        path: {
+                            name: 'app.ts',
+                            path: 'src/app.ts',
+                            extension: 'ts',
+                        },
+                        type: 'MODIFY',
+                        gitChangeType: 'MODIFY',
+                        comments: 2,
+                    },
+                ],
+                summary: {
+                    totalChanges: 1,
+                    additions: 0,
+                    deletions: 0,
+                    modifications: 1,
+                    moves: 0,
+                    filesWithComments: 1,
+                },
+                isLastPage: true,
+            });
+        });
+        it('returns summary output when requested', async () => {
+            PullRequestsService.streamChanges1.mockResolvedValue(mockChangesResponse);
+            const result = await service.getPullRequestChanges('TEST', 'repo', '123', undefined, undefined, undefined, undefined, undefined, undefined, 'summary');
+            expect(result.success).toBe(true);
+            expect(result.data).toEqual({
+                fromHash: 'abc',
+                toHash: 'def',
+                changeScope: 'ALL',
+                isLastPage: true,
+                summary: {
+                    totalChanges: 1,
+                    additions: 0,
+                    deletions: 0,
+                    modifications: 1,
+                    moves: 0,
+                    filesWithComments: 1,
+                },
+                items: ['Modified: src/app.ts [2 comments]'],
+            });
+        });
+        it('returns the raw payload when output is full', async () => {
+            PullRequestsService.streamChanges1.mockResolvedValue(mockChangesResponse);
+            const result = await service.getPullRequestChanges('TEST', 'repo', '123', undefined, undefined, undefined, undefined, undefined, undefined, 'full');
+            expect(result.success).toBe(true);
+            expect(result.data).toBe(mockChangesResponse);
+        });
+    });
+    describe('full mutation output', () => {
+        it('returns the raw comment response when requested', async () => {
+            const mockComment = {
+                id: 222,
+                text: 'Raw comment',
+                state: 'OPEN',
+            };
+            PullRequestsService.createComment2.mockResolvedValue(mockComment);
+            const result = await service.postPullRequestComment('TEST', 'repo', '123', 'Raw comment', undefined, undefined, undefined, undefined, undefined, 'full');
+            expect(result.success).toBe(true);
+            expect(result.data).toBe(mockComment);
+        });
+        it('returns the raw PR create response when requested', async () => {
+            const mockPullRequest = {
+                id: 10,
+                version: 1,
+                title: 'Raw create',
+                state: 'OPEN',
+            };
+            PullRequestsService.create.mockResolvedValue(mockPullRequest);
+            const result = await service.createPullRequest('TEST', 'repo', 'Raw create', undefined, 'refs/heads/feature', 'refs/heads/main', undefined, 'full');
+            expect(result.success).toBe(true);
+            expect(result.data).toBe(mockPullRequest);
+        });
+        it('returns the raw PR update response when requested', async () => {
+            const mockPullRequest = {
+                id: 11,
+                version: 2,
+                title: 'Raw update',
+                state: 'OPEN',
+            };
+            PullRequestsService.update.mockResolvedValue(mockPullRequest);
+            const result = await service.updatePullRequest('TEST', 'repo', '123', 1, 'Raw update', undefined, undefined, 'full');
+            expect(result.success).toBe(true);
+            expect(result.data).toBe(mockPullRequest);
+        });
+    });
+});
+//# sourceMappingURL=bitbucket-token-optimization.test.js.map

package/build/__tests__/bitbucket-token-optimization.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-token-optimization.test.js","sourceRoot":"","sources":["../../src/__tests__/bitbucket-token-optimization.test.ts"],"names":[],"mappings":"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"}

package/build/__tests__/config.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=config.test.d.ts.map

package/build/__tests__/config.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/config.test.ts"],"names":[],"mappings":""}

package/build/__tests__/config.test.js

@@ -0,0 +1,49 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+describe('Bitbucket config', () => {
+    const originalEnv = process.env;
+    const originalCwd = process.cwd();
+    let tempDir;
+    beforeEach(() => {
+        jest.resetModules();
+        process.env = { ...originalEnv };
+        delete process.env.ATLASSIAN_DC_MCP_CONFIG_FILE;
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'bitbucket-config-'));
+        process.chdir(tempDir);
+    });
+    afterEach(() => {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+        process.chdir(originalCwd);
+    });
+    afterAll(() => {
+        process.env = originalEnv;
+    });
+    it('uses the configured page size when the env var is a positive integer', async () => {
+        process.env.BITBUCKET_DEFAULT_PAGE_SIZE = '40';
+        const { getDefaultPageSize } = await import('../config.js');
+        expect(getDefaultPageSize()).toBe(40);
+    });
+    it('falls back to 25 when the env var is invalid', async () => {
+        process.env.BITBUCKET_DEFAULT_PAGE_SIZE = '-1';
+        const { getDefaultPageSize } = await import('../config.js');
+        expect(getDefaultPageSize()).toBe(25);
+    });
+    it('reads the page size from the shared config file', async () => {
+        const sharedConfigPath = path.join(tempDir, 'shared.env');
+        fs.writeFileSync(sharedConfigPath, 'BITBUCKET_HOST=file-host\nBITBUCKET_API_TOKEN=file-token\nBITBUCKET_DEFAULT_PAGE_SIZE=35\n');
+        process.env.ATLASSIAN_DC_MCP_CONFIG_FILE = sharedConfigPath;
+        const { getBitbucketRuntimeConfig, getDefaultPageSize } = await import('../config.js');
+        expect(getDefaultPageSize()).toBe(35);
+        expect(getBitbucketRuntimeConfig().token).toBe('file-token');
+    });
+    it('keeps env values higher priority than the shared config file', async () => {
+        const sharedConfigPath = path.join(tempDir, 'shared.env');
+        fs.writeFileSync(sharedConfigPath, 'BITBUCKET_HOST=file-host\nBITBUCKET_API_TOKEN=file-token\nBITBUCKET_DEFAULT_PAGE_SIZE=35\n');
+        process.env.ATLASSIAN_DC_MCP_CONFIG_FILE = sharedConfigPath;
+        process.env.BITBUCKET_DEFAULT_PAGE_SIZE = '45';
+        const { getDefaultPageSize } = await import('../config.js');
+        expect(getDefaultPageSize()).toBe(45);
+    });
+});
+//# sourceMappingURL=config.test.js.map

package/build/__tests__/config.test.js.map

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

package/build/__tests__/pr-comment-mapper.test.js

@@ -1,4 +1,4 @@
-import { simplifyBitbucketPRComments, getCommentSummary } from '../pr-comment-mapper.js';
+import { filterPullRequestComments, simplifyBitbucketPRComments, getCommentSummary } from '../pr-comment-mapper.js';
 import { formatToolResponse } from '@atlassian-dc-mcp/common';
 function createUser(name, id, displayName) {
     return {
@@ -69,6 +69,7 @@ describe('PR Comment Mapper', () => {
         ],
         start: 0
     };
+    const [baseCommentActivity, openedActivity] = validPRResponse.values ?? [];
     describe('simplifyBitbucketPRComments', () => {
         it('should simplify valid PR response correctly', () => {
             const result = simplifyBitbucketPRComments(validPRResponse);
@@ -184,6 +185,137 @@ describe('PR Comment Mapper', () => {
                 }
             ]);
         });
+        it('should exclude resolved threads and all replies by default', () => {
+            const resolvedThreadResponse = {
+                ...validPRResponse,
+                values: [
+                    openedActivity,
+                    {
+                        id: 1003,
+                        createdDate: 1600000002000,
+                        user: createUser('reviewer3', 105, 'Reviewer Three'),
+                        action: 'COMMENTED',
+                        commentAction: 'ADDED',
+                        comment: createComment({
+                            id: 2004,
+                            text: 'Resolved thread root',
+                            threadResolved: true,
+                            comments: [
+                                createComment({
+                                    id: 2005,
+                                    text: 'Resolved reply',
+                                    anchor: undefined,
+                                    threadResolved: true,
+                                })
+                            ]
+                        })
+                    },
+                    baseCommentActivity,
+                ],
+            };
+            const result = simplifyBitbucketPRComments(resolvedThreadResponse);
+            expect(result.activities).toEqual([
+                {
+                    id: 1002,
+                    createdDate: 1600000001000,
+                    user: {
+                        name: 'testuser2',
+                        displayName: 'User B'
+                    },
+                    action: 'OPENED'
+                },
+                {
+                    id: 1001,
+                    createdDate: 1600000000000,
+                    user: {
+                        name: 'testuser1',
+                        displayName: 'User A'
+                    },
+                    action: 'COMMENTED',
+                    commentAction: 'ADDED',
+                    comment: {
+                        id: 2001,
+                        text: 'This needs review',
+                        author: {
+                            name: 'testuser1',
+                            displayName: 'User A'
+                        },
+                        createdDate: 1600000000000,
+                        anchor: {
+                            line: 6,
+                            path: 'config.yml',
+                            fileType: 'TO'
+                        },
+                        comments: [],
+                        threadResolved: false,
+                        state: 'OPEN'
+                    }
+                }
+            ]);
+            expect(result.summary.commentCount).toBe(1);
+            expect(getCommentSummary(resolvedThreadResponse)).toEqual(['User A on config.yml:6: This needs review']);
+        });
+        it('should include resolved threads when requested', () => {
+            const resolvedThreadResponse = {
+                ...validPRResponse,
+                values: [
+                    {
+                        id: 1003,
+                        createdDate: 1600000002000,
+                        user: createUser('reviewer3', 105, 'Reviewer Three'),
+                        action: 'COMMENTED',
+                        commentAction: 'ADDED',
+                        comment: createComment({
+                            id: 2004,
+                            text: 'Resolved thread root',
+                            threadResolved: true,
+                            comments: [
+                                createComment({
+                                    id: 2005,
+                                    text: 'Resolved reply',
+                                    anchor: undefined,
+                                    threadResolved: true,
+                                })
+                            ]
+                        })
+                    }
+                ],
+            };
+            const result = simplifyBitbucketPRComments(resolvedThreadResponse, { includeResolved: true });
+            expect(result.activities[0].comment).toEqual({
+                id: 2004,
+                text: 'Resolved thread root',
+                author: {
+                    name: 'testuser1',
+                    displayName: 'User A'
+                },
+                createdDate: 1600000000000,
+                anchor: {
+                    line: 6,
+                    path: 'config.yml',
+                    fileType: 'TO'
+                },
+                comments: [
+                    {
+                        id: 2005,
+                        text: 'Resolved reply',
+                        author: {
+                            name: 'testuser1',
+                            displayName: 'User A'
+                        },
+                        createdDate: 1600000000000,
+                        comments: [],
+                        threadResolved: true,
+                        state: 'OPEN'
+                    }
+                ],
+                threadResolved: true,
+                state: 'OPEN'
+            });
+            expect(getCommentSummary(resolvedThreadResponse, { includeResolved: true })).toEqual([
+                'User A on config.yml:6: Resolved thread root'
+            ]);
+        });
         it('should skip malformed nested replies', () => {
             const malformedNestedResponse = {
                 ...validPRResponse,
@@ -335,5 +467,24 @@ describe('PR Comment Mapper', () => {
             expect(summary).toHaveLength(0);
         });
     });
+    describe('filterPullRequestComments', () => {
+        it('should keep non-comment activities while removing resolved comment activities by default', () => {
+            const response = {
+                ...validPRResponse,
+                values: [
+                    openedActivity,
+                    {
+                        id: 1004,
+                        createdDate: 1600000003000,
+                        user: createUser('reviewer4', 106, 'Reviewer Four'),
+                        action: 'COMMENTED',
+                        commentAction: 'ADDED',
+                        comment: createComment({ id: 2006, threadResolved: true })
+                    }
+                ]
+            };
+            expect(filterPullRequestComments(response).values).toEqual([openedActivity]);
+        });
+    });
 });
 //# sourceMappingURL=pr-comment-mapper.test.js.map