@atlassian-dc-mcp/bitbucket 0.12.0 → 0.12.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,25 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.12.2](https://github.com/b1ff/atlassian-dc-mcp/compare/v0.12.1...v0.12.2) (2026-03-21)
7
+
8
+ **Note:** Version bump only for package @atlassian-dc-mcp/bitbucket
9
+
10
+
11
+
12
+
13
+
14
+ ## [0.12.1](https://github.com/b1ff/atlassian-dc-mcp/compare/v0.12.0...v0.12.1) (2026-03-21)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * **bitbucket:** [#22](https://github.com/b1ff/atlassian-dc-mcp/issues/22) address the issue that replies in PRs are invisible to LLM ([bb22fa1](https://github.com/b1ff/atlassian-dc-mcp/commit/bb22fa1e8cc80f3983c08f58bd6cdd735f7eb9d7))
20
+
21
+
22
+
23
+
24
+
6
25
  # [0.12.0](https://github.com/b1ff/atlassian-dc-mcp/compare/v0.11.2...v0.12.0) (2026-03-18)
7
26
 
8
27
 
@@ -1,4 +1,50 @@
1
1
  import { simplifyBitbucketPRComments, getCommentSummary } from '../pr-comment-mapper.js';
2
+ import { formatToolResponse } from '@atlassian-dc-mcp/common';
3
+ function createUser(name, id, displayName) {
4
+ return {
5
+ name,
6
+ emailAddress: `${name}@company.local`,
7
+ active: true,
8
+ displayName,
9
+ id,
10
+ slug: name,
11
+ type: "NORMAL",
12
+ links: {
13
+ self: [{ href: `https://bitbucket.company.local/users/${name}` }]
14
+ }
15
+ };
16
+ }
17
+ function createComment(overrides = {}) {
18
+ return {
19
+ properties: { repositoryId: 1001 },
20
+ id: 2001,
21
+ version: 0,
22
+ text: "This needs review",
23
+ author: createUser('testuser1', 101, 'User A'),
24
+ createdDate: 1600000000000,
25
+ updatedDate: 1600000000000,
26
+ comments: [],
27
+ anchor: {
28
+ fromHash: "abc123def456789012345678901234567890abcd",
29
+ toHash: "def456abc789012345678901234567890123cdef",
30
+ line: 6,
31
+ lineType: "ADDED",
32
+ fileType: "TO",
33
+ path: "config.yml",
34
+ diffType: "EFFECTIVE",
35
+ orphaned: false
36
+ },
37
+ threadResolved: false,
38
+ severity: "NORMAL",
39
+ state: "OPEN",
40
+ permittedOperations: {
41
+ editable: false,
42
+ transitionable: true,
43
+ deletable: false
44
+ },
45
+ ...overrides
46
+ };
47
+ }
2
48
  describe('PR Comment Mapper', () => {
3
49
  // Test data from the original ad-hoc test
4
50
  const validPRResponse = {
@@ -9,75 +55,15 @@ describe('PR Comment Mapper', () => {
9
55
  {
10
56
  id: 1001,
11
57
  createdDate: 1600000000000,
12
- user: {
13
- name: "testuser1",
14
- emailAddress: "testuser1@company.local",
15
- active: true,
16
- displayName: "User A",
17
- id: 101,
18
- slug: "testuser1",
19
- type: "NORMAL",
20
- links: {
21
- self: [{ href: "https://bitbucket.company.local/users/testuser1" }]
22
- }
23
- },
58
+ user: createUser('testuser1', 101, 'User A'),
24
59
  action: "COMMENTED",
25
60
  commentAction: "ADDED",
26
- comment: {
27
- properties: { repositoryId: 1001 },
28
- id: 2001,
29
- version: 0,
30
- text: "This needs review",
31
- author: {
32
- name: "testuser1",
33
- emailAddress: "testuser1@company.local",
34
- active: true,
35
- displayName: "User A",
36
- id: 101,
37
- slug: "testuser1",
38
- type: "NORMAL",
39
- links: {
40
- self: [{ href: "https://bitbucket.company.local/users/testuser1" }]
41
- }
42
- },
43
- createdDate: 1600000000000,
44
- updatedDate: 1600000000000,
45
- comments: [],
46
- anchor: {
47
- fromHash: "abc123def456789012345678901234567890abcd",
48
- toHash: "def456abc789012345678901234567890123cdef",
49
- line: 6,
50
- lineType: "ADDED",
51
- fileType: "TO",
52
- path: "config.yml",
53
- diffType: "EFFECTIVE",
54
- orphaned: false
55
- },
56
- threadResolved: false,
57
- severity: "NORMAL",
58
- state: "OPEN",
59
- permittedOperations: {
60
- editable: false,
61
- transitionable: true,
62
- deletable: false
63
- }
64
- }
61
+ comment: createComment()
65
62
  },
66
63
  {
67
64
  id: 1002,
68
65
  createdDate: 1600000001000,
69
- user: {
70
- name: "testuser2",
71
- emailAddress: "testuser2@company.local",
72
- active: true,
73
- displayName: "User B",
74
- id: 102,
75
- slug: "testuser2",
76
- type: "NORMAL",
77
- links: {
78
- self: [{ href: "https://bitbucket.company.local/users/testuser2" }]
79
- }
80
- },
66
+ user: createUser('testuser2', 102, 'User B'),
81
67
  action: "OPENED"
82
68
  }
83
69
  ],
@@ -111,6 +97,7 @@ describe('PR Comment Mapper', () => {
111
97
  path: "config.yml",
112
98
  fileType: "TO"
113
99
  },
100
+ comments: [],
114
101
  threadResolved: false,
115
102
  state: "OPEN"
116
103
  }
@@ -137,6 +124,148 @@ describe('PR Comment Mapper', () => {
137
124
  };
138
125
  expect(result).toEqual(expectedResult);
139
126
  });
127
+ it('should preserve nested replies recursively', () => {
128
+ const threadedResponse = {
129
+ ...validPRResponse,
130
+ values: [
131
+ {
132
+ id: 1001,
133
+ createdDate: 1600000000000,
134
+ user: createUser('testuser1', 101, 'User A'),
135
+ action: "COMMENTED",
136
+ commentAction: "ADDED",
137
+ comment: createComment({
138
+ comments: [
139
+ createComment({
140
+ id: 2002,
141
+ text: "Author reply",
142
+ author: createUser('author1', 103, 'Author One'),
143
+ anchor: undefined,
144
+ comments: [
145
+ createComment({
146
+ id: 2003,
147
+ text: "Reviewer follow-up",
148
+ author: createUser('reviewer2', 104, 'Reviewer Two'),
149
+ anchor: undefined
150
+ })
151
+ ]
152
+ })
153
+ ]
154
+ })
155
+ }
156
+ ]
157
+ };
158
+ const result = simplifyBitbucketPRComments(threadedResponse);
159
+ expect(result.activities[0].comment?.comments).toEqual([
160
+ {
161
+ id: 2002,
162
+ text: "Author reply",
163
+ author: {
164
+ name: "author1",
165
+ displayName: "Author One"
166
+ },
167
+ createdDate: 1600000000000,
168
+ comments: [
169
+ {
170
+ id: 2003,
171
+ text: "Reviewer follow-up",
172
+ author: {
173
+ name: "reviewer2",
174
+ displayName: "Reviewer Two"
175
+ },
176
+ createdDate: 1600000000000,
177
+ comments: [],
178
+ threadResolved: false,
179
+ state: "OPEN"
180
+ }
181
+ ],
182
+ threadResolved: false,
183
+ state: "OPEN"
184
+ }
185
+ ]);
186
+ });
187
+ it('should skip malformed nested replies', () => {
188
+ const malformedNestedResponse = {
189
+ ...validPRResponse,
190
+ values: [
191
+ {
192
+ id: 1001,
193
+ createdDate: 1600000000000,
194
+ user: createUser('testuser1', 101, 'User A'),
195
+ action: "COMMENTED",
196
+ commentAction: "ADDED",
197
+ comment: createComment({
198
+ comments: [
199
+ { id: 'bad-comment-id' },
200
+ createComment({
201
+ id: 2002,
202
+ text: "Valid reply",
203
+ anchor: undefined
204
+ })
205
+ ]
206
+ })
207
+ }
208
+ ]
209
+ };
210
+ const result = simplifyBitbucketPRComments(malformedNestedResponse);
211
+ expect(result.activities[0].comment?.comments).toEqual([
212
+ {
213
+ id: 2002,
214
+ text: "Valid reply",
215
+ author: {
216
+ name: "testuser1",
217
+ displayName: "User A"
218
+ },
219
+ createdDate: 1600000000000,
220
+ comments: [],
221
+ threadResolved: false,
222
+ state: "OPEN"
223
+ }
224
+ ]);
225
+ });
226
+ it('should drop cyclic reply branches and remain JSON serializable', () => {
227
+ const rootComment = createComment();
228
+ const childComment = createComment({
229
+ id: 2002,
230
+ text: "Child reply",
231
+ anchor: undefined
232
+ });
233
+ rootComment.comments = [childComment];
234
+ childComment.comments = [rootComment];
235
+ const cyclicResponse = {
236
+ size: 1,
237
+ limit: 100,
238
+ isLastPage: true,
239
+ values: [
240
+ {
241
+ id: 1001,
242
+ createdDate: 1600000000000,
243
+ user: createUser('testuser1', 101, 'User A'),
244
+ action: "COMMENTED",
245
+ commentAction: "ADDED",
246
+ comment: rootComment
247
+ }
248
+ ],
249
+ start: 0
250
+ };
251
+ const result = simplifyBitbucketPRComments(cyclicResponse);
252
+ expect(result.activities[0].comment?.comments).toEqual([
253
+ {
254
+ id: 2002,
255
+ text: "Child reply",
256
+ author: {
257
+ name: "testuser1",
258
+ displayName: "User A"
259
+ },
260
+ createdDate: 1600000000000,
261
+ comments: [],
262
+ threadResolved: false,
263
+ state: "OPEN"
264
+ }
265
+ ]);
266
+ expect(() => formatToolResponse(result)).not.toThrow();
267
+ expect(JSON.parse(formatToolResponse(result).content[0].text)).toBeTruthy();
268
+ });
140
269
  it('should handle malformed input gracefully', () => {
141
270
  const malformedInput = { invalid: 'data' };
142
271
  const result = simplifyBitbucketPRComments(malformedInput);
@@ -1 +1 @@
1
- {"version":3,"file":"pr-comment-mapper.test.js","sourceRoot":"","sources":["../../src/__tests__/pr-comment-mapper.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pr-comment-mapper.test.js","sourceRoot":"","sources":["../../src/__tests__/pr-comment-mapper.test.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,7 @@ interface SimplifiedComment {
21
21
  author: SimplifiedUser;
22
22
  createdDate: number;
23
23
  anchor?: SimplifiedAnchor;
24
+ comments: SimplifiedComment[];
24
25
  threadResolved: boolean;
25
26
  state: string;
26
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pr-comment-mapper.d.ts","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"AAkHA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAGD,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,iBAAiB;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,kBAAkB;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,OAAO,EAAE;QACP,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,EAAE,cAAc,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAqGD,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,sBAAsB,GAAG,oBAAoB,GAAG,sBAAsB,CAiC3H;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,MAAM,EAAE,CAkB5E"}
1
+ {"version":3,"file":"pr-comment-mapper.d.ts","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"AAkHA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAGD,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,iBAAiB;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,kBAAkB;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,OAAO,EAAE;QACP,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,EAAE,cAAc,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AA8GD,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,sBAAsB,GAAG,oBAAoB,GAAG,sBAAsB,CAiC3H;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,MAAM,EAAE,CAkB5E"}
@@ -60,13 +60,19 @@ function simplifyAnchor(anchor) {
60
60
  fileType: anchor.fileType
61
61
  };
62
62
  }
63
- function simplifyComment(comment) {
63
+ function simplifyComment(comment, ancestorIds = new Set()) {
64
+ const nextAncestorIds = new Set(ancestorIds);
65
+ nextAncestorIds.add(comment.id);
64
66
  return {
65
67
  id: comment.id,
66
68
  text: comment.text,
67
69
  author: simplifyUser(comment.author),
68
70
  createdDate: comment.createdDate,
69
71
  ...(comment.anchor && { anchor: simplifyAnchor(comment.anchor) }),
72
+ comments: comment.comments
73
+ .filter(isComment)
74
+ .filter(childComment => !nextAncestorIds.has(childComment.id))
75
+ .map(childComment => simplifyComment(childComment, nextAncestorIds)),
70
76
  threadResolved: comment.threadResolved,
71
77
  state: comment.state
72
78
  };
@@ -78,7 +84,9 @@ function simplifyActivity(activity) {
78
84
  user: simplifyUser(activity.user),
79
85
  action: activity.action,
80
86
  ...(activity.commentAction && { commentAction: activity.commentAction }),
81
- ...(activity.comment && { comment: simplifyComment(activity.comment) })
87
+ ...(activity.comment && isComment(activity.comment) && {
88
+ comment: simplifyComment(activity.comment)
89
+ })
82
90
  };
83
91
  }
84
92
  export function simplifyBitbucketPRComments(response) {
@@ -1 +1 @@
1
- {"version":3,"file":"pr-comment-mapper.js","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pr-comment-mapper.js","sourceRoot":"","sources":["../src/pr-comment-mapper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlassian-dc-mcp/bitbucket",
3
- "version": "0.12.0",
3
+ "version": "0.12.2",
4
4
  "main": "build/index.js",
5
5
  "type": "module",
6
6
  "bin": "./bin/run.js",
@@ -14,7 +14,7 @@
14
14
  "test": "jest"
15
15
  },
16
16
  "dependencies": {
17
- "@atlassian-dc-mcp/common": "^0.12.0",
17
+ "@atlassian-dc-mcp/common": "^0.12.2",
18
18
  "@modelcontextprotocol/sdk": "^1.27.1",
19
19
  "dotenv": "^16.4.7",
20
20
  "node-fetch": "^3.3.2",
@@ -32,5 +32,5 @@
32
32
  "publishConfig": {
33
33
  "access": "public"
34
34
  },
35
- "gitHead": "aa5b3696f257a8fccfc1930d2a46c17ecd695cdc"
35
+ "gitHead": "6488590c1832714d510cc4a4f5f3d9e8e38f3b09"
36
36
  }