@atlassian-dc-mcp/bitbucket 0.12.2 → 0.13.0

package/src/__tests__/bitbucket-token-optimization.test.ts

@@ -0,0 +1,314 @@
+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: string, displayName: string) {
+  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: Record<string, unknown> = {}) {
+  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: BitbucketService;
+
+  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 as jest.Mock).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('returns summary output when requested', async () => {
+      (PullRequestsService.getActivities as jest.Mock).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 as jest.Mock).mockResolvedValue(mockActivityResponse);
+
+      const result = await service.getPullRequestCommentsAndActions('TEST', 'repo', '123', undefined, undefined, 'full');
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(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 as jest.Mock).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 as jest.Mock).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 as jest.Mock).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 as jest.Mock).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 as jest.Mock).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 as jest.Mock).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);
+    });
+  });
+});

package/src/__tests__/config.test.ts

@@ -0,0 +1,64 @@
+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: string;
+
+  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);
+  });
+});

package/src/bitbucket-response-mapper.ts

@@ -0,0 +1,112 @@
+import { BitbucketPRApiResponse, getCommentSummary, simplifyBitbucketPRComments } from './pr-comment-mapper.js';
+import { getChangesSummary, simplifyBitbucketPRChanges } from './pr-changes-mapper.js';
+
+export type BitbucketOutputMode = 'summary' | 'compact' | 'full';
+export type BitbucketMutationOutputMode = 'ack' | 'full';
+
+function getLink(links: any): string | undefined {
+  const selfLinks = links?.self;
+  if (Array.isArray(selfLinks)) {
+    const link = selfLinks.find(item => typeof item?.href === 'string');
+    return link?.href;
+  }
+
+  if (typeof selfLinks === 'string') {
+    return selfLinks;
+  }
+
+  return undefined;
+}
+
+function hasSummary(value: any): value is { summary: unknown; isLastPage?: boolean } {
+  return Boolean(value) && typeof value === 'object' && 'summary' in value;
+}
+
+export function shapePullRequestCommentsResponse(
+  response: BitbucketPRApiResponse,
+  output: BitbucketOutputMode = 'compact',
+): Record<string, any> {
+  if (output === 'full') {
+    return response;
+  }
+
+  const compact = simplifyBitbucketPRComments(response);
+  if (output === 'compact') {
+    return compact;
+  }
+
+  return {
+    isLastPage: hasSummary(compact) ? compact.isLastPage ?? true : response.isLastPage ?? true,
+    summary: hasSummary(compact)
+      ? compact.summary
+      : {
+          totalActivities: Array.isArray(response.values) ? response.values.length : 0,
+          commentCount: getCommentSummary(response).length,
+          unresolvedCount: 0,
+        },
+    items: getCommentSummary(response),
+  };
+}
+
+export function shapePullRequestChangesResponse(response: any, output: BitbucketOutputMode = 'compact'): Record<string, any> {
+  if (output === 'full') {
+    return response;
+  }
+
+  const compact = simplifyBitbucketPRChanges(response);
+  if (output === 'compact') {
+    return compact;
+  }
+
+  return {
+    ...(typeof response?.fromHash === 'string' ? { fromHash: response.fromHash } : {}),
+    ...(typeof response?.toHash === 'string' ? { toHash: response.toHash } : {}),
+    ...(typeof response?.properties?.changeScope === 'string' ? { changeScope: response.properties.changeScope } : {}),
+    isLastPage: hasSummary(compact) ? compact.isLastPage ?? true : response?.isLastPage ?? true,
+    summary: hasSummary(compact)
+      ? compact.summary
+      : {
+          totalChanges: Array.isArray(response?.values) ? response.values.length : 0,
+          additions: 0,
+          deletions: 0,
+          modifications: 0,
+          moves: 0,
+          filesWithComments: 0,
+        },
+    items: getChangesSummary(response),
+  };
+}
+
+export function shapePullRequestAck(pullRequest: any): Record<string, any> {
+  const link = getLink(pullRequest?.links);
+  return {
+    ...(pullRequest?.id !== undefined ? { id: pullRequest.id } : {}),
+    ...(pullRequest?.version !== undefined ? { version: pullRequest.version } : {}),
+    ...(typeof pullRequest?.title === 'string' ? { title: pullRequest.title } : {}),
+    ...(typeof pullRequest?.state === 'string' ? { state: pullRequest.state } : {}),
+    ...(typeof pullRequest?.fromRef?.id === 'string' ? { fromRefId: pullRequest.fromRef.id } : {}),
+    ...(typeof pullRequest?.toRef?.id === 'string' ? { toRefId: pullRequest.toRef.id } : {}),
+    reviewerCount: Array.isArray(pullRequest?.reviewers) ? pullRequest.reviewers.length : 0,
+    ...(link ? { link } : {}),
+  };
+}
+
+export function shapePullRequestCommentAck(comment: any): Record<string, any> {
+  const link = getLink(comment?.links);
+  return {
+    ...(comment?.id !== undefined ? { id: comment.id } : {}),
+    ...(comment?.parent?.id !== undefined ? { parentId: comment.parent.id } : {}),
+    ...(typeof comment?.state === 'string' ? { state: comment.state } : {}),
+    pending: comment?.state === 'PENDING',
+    ...(typeof comment?.anchor?.path === 'string'
+      ? {
+          anchor: {
+            path: comment.anchor.path,
+            ...(comment.anchor.line !== undefined ? { line: comment.anchor.line } : {}),
+            ...(typeof comment.anchor.lineType === 'string' ? { lineType: comment.anchor.lineType } : {}),
+          },
+        }
+      : {}),
+    ...(link ? { link } : {}),
+  };
+}