@atlassian-dc-mcp/bitbucket 0.25.0 → 0.26.0

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

@@ -861,10 +861,8 @@ describe('BitbucketService', () => {
           line: 15,
           lineType: 'ADDED',
           fileType: 'TO',
-          multilineAnchor: true,
-          multilineStartLine: 10,
-          multilineStartLineType: 'ADDED',
-          multilineDestinationRange: { minimum: 10, maximum: 15 }
+          multilineMarker: { startLine: 10, startLineType: 'ADDED' },
+          multilineSpan: { dstSpanStart: 10, dstSpanEnd: 15 }
         }
       };
       (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue(mockComment);
@@ -906,10 +904,8 @@ describe('BitbucketService', () => {
             line: 15,
             lineType: 'ADDED',
             fileType: 'TO',
-            multilineAnchor: true,
-            multilineStartLine: 10,
-            multilineStartLineType: 'ADDED',
-            multilineDestinationRange: { minimum: 10, maximum: 15 }
+            multilineMarker: { startLine: 10, startLineType: 'ADDED' },
+            multilineSpan: { dstSpanStart: 10, dstSpanEnd: 15 }
           }
         }
       );
@@ -926,10 +922,8 @@ describe('BitbucketService', () => {
           line: 8,
           lineType: 'ADDED',
           fileType: 'TO',
-          multilineAnchor: true,
-          multilineStartLine: 5,
-          multilineStartLineType: 'CONTEXT',
-          multilineDestinationRange: { minimum: 5, maximum: 8 }
+          multilineMarker: { startLine: 5, startLineType: 'CONTEXT' },
+          multilineSpan: { dstSpanStart: 5, dstSpanEnd: 8 }
         }
       };
       (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue(mockComment);
@@ -959,15 +953,133 @@ describe('BitbucketService', () => {
             line: 8,
             lineType: 'ADDED',
             fileType: 'TO',
-            multilineAnchor: true,
-            multilineStartLine: 5,
-            multilineStartLineType: 'CONTEXT',
-            multilineDestinationRange: { minimum: 5, maximum: 8 }
+            multilineMarker: { startLine: 5, startLineType: 'CONTEXT' },
+            multilineSpan: { dstSpanStart: 5, dstSpanEnd: 8 }
           }
         }
       );
     });
 
+    it('should normalize a reversed multiline range (startLine > line)', async () => {
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue({ id: 1, anchor: { path: 'src/test.js' } });
+
+      await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'Reversed range',
+        undefined,      // parentId
+        'src/test.js',  // filePath
+        15,             // startLine (greater than line)
+        'ADDED',        // startLineType
+        10,             // line (end line, smaller)
+        'ADDED'         // lineType
+      );
+
+      expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        {
+          text: 'Reversed range',
+          anchor: {
+            path: 'src/test.js',
+            diffType: 'EFFECTIVE',
+            line: 15,
+            lineType: 'ADDED',
+            fileType: 'TO',
+            multilineMarker: { startLine: 10, startLineType: 'ADDED' },
+            multilineSpan: { dstSpanStart: 10, dstSpanEnd: 15 }
+          }
+        }
+      );
+    });
+
+    it('should anchor a REMOVED multiline range to the source file', async () => {
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue({ id: 1, anchor: { path: 'src/test.js' } });
+
+      await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        'Removed range',
+        undefined,      // parentId
+        'src/test.js',  // filePath
+        2,              // startLine
+        'REMOVED',      // startLineType
+        5,              // line (end line)
+        'REMOVED'       // lineType
+      );
+
+      expect(PullRequestsService.createComment2).toHaveBeenCalledWith(
+        mockProjectKey,
+        mockPullRequestId,
+        mockRepositorySlug,
+        {
+          text: 'Removed range',
+          anchor: {
+            path: 'src/test.js',
+            diffType: 'EFFECTIVE',
+            line: 5,
+            lineType: 'REMOVED',
+            fileType: 'FROM',
+            multilineMarker: { startLine: 2, startLineType: 'REMOVED' },
+            multilineSpan: { srcSpanStart: 2, srcSpanEnd: 5 }
+          }
+        }
+      );
+    });
+
+    it('should warn when a multi-line suggestion is anchored to a single line', async () => {
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue({
+        id: 99,
+        anchor: { path: 'src/test.js', line: 5, lineType: 'ADDED' }
+      });
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        '```suggestion\nconst a = 1;\nconst b = 2;\n```',
+        undefined,      // parentId
+        'src/test.js',  // filePath
+        undefined,      // startLine (single-line anchor — the bug shape)
+        undefined,      // startLineType
+        5,              // line
+        'ADDED'         // lineType
+      );
+
+      expect(result.success).toBe(true);
+      expect((result.data as any).warning).toMatch(/multi-line ```suggestion/);
+      // single-line anchor: no multiline fields sent
+      const sentAnchor = (PullRequestsService.createComment2 as jest.Mock).mock.calls[0][3].anchor;
+      expect(sentAnchor.multilineMarker).toBeUndefined();
+      expect(sentAnchor.multilineSpan).toBeUndefined();
+    });
+
+    it('should not warn when a multi-line suggestion has a proper multiline range', async () => {
+      (PullRequestsService.createComment2 as jest.Mock).mockResolvedValue({
+        id: 100,
+        anchor: { path: 'src/test.js', line: 5, lineType: 'ADDED', multilineMarker: { startLine: 4, startLineType: 'ADDED' } }
+      });
+
+      const result = await bitbucketService.postPullRequestComment(
+        mockProjectKey,
+        mockRepositorySlug,
+        mockPullRequestId,
+        '```suggestion\nconst a = 1;\nconst b = 2;\n```',
+        undefined,      // parentId
+        'src/test.js',  // filePath
+        4,              // startLine
+        'ADDED',        // startLineType
+        5,              // line
+        'ADDED'         // lineType
+      );
+
+      expect(result.success).toBe(true);
+      expect((result.data as any).warning).toBeUndefined();
+    });
+
     it('should handle API errors gracefully', async () => {
       const mockError = new Error('API Error');
       (PullRequestsService.createComment2 as jest.Mock).mockRejectedValue(mockError);
@@ -2473,4 +2585,63 @@ describe('BitbucketService', () => {
       );
     });
   });
+
+  describe('searchCode', () => {
+    const { request: mockRequest } = require('../bitbucket-client/core/request.js');
+
+    it('should search code with the default page size', async () => {
+      const mockData = { code: { count: 1, values: [{ repository: { slug: 'demo' } }] } };
+      mockRequest.mockResolvedValue(mockData);
+
+      const result = await bitbucketService.searchCode('app');
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBe(mockData);
+      expect(mockRequest).toHaveBeenCalledWith(
+        expect.any(Object),
+        {
+          method: 'POST',
+          url: '/search/latest/search',
+          body: {
+            query: 'app',
+            entities: { code: {} },
+            limits: { primary: 25 }
+          },
+          mediaType: 'application/json',
+          errors: {
+            400: 'The search query was malformed.',
+            401: 'The currently authenticated user is not permitted to search.',
+          },
+        }
+      );
+    });
+
+    it('should pass explicit primary and secondary limits', async () => {
+      mockRequest.mockResolvedValue({ code: { count: 0, values: [] } });
+
+      await bitbucketService.searchCode('repo:demo TODO', 10, 5);
+
+      expect(mockRequest).toHaveBeenCalledWith(
+        expect.any(Object),
+        expect.objectContaining({
+          method: 'POST',
+          url: '/search/latest/search',
+          body: {
+            query: 'repo:demo TODO',
+            entities: { code: {} },
+            limits: { primary: 10, secondary: 5 }
+          },
+        })
+      );
+    });
+
+    it('should handle errors when searching', async () => {
+      mockRequest.mockRejectedValue(new Error('API Error'));
+
+      const result = await bitbucketService.searchCode('app');
+
+      expect(result.success).toBe(false);
+      expect(result.error).toBeDefined();
+    });
+  });
 });

package/src/bitbucket-response-mapper.ts

@@ -113,10 +113,10 @@ export function shapePullRequestCommentAck(comment: any): Record<string, any> {
             path: comment.anchor.path,
             ...(comment.anchor.line !== undefined ? { line: comment.anchor.line } : {}),
             ...(typeof comment.anchor.lineType === 'string' ? { lineType: comment.anchor.lineType } : {}),
-            ...(comment.anchor.multilineAnchor
+            ...(comment.anchor.multilineMarker
               ? {
-                  startLine: comment.anchor.multilineStartLine,
-                  startLineType: comment.anchor.multilineStartLineType,
+                  startLine: comment.anchor.multilineMarker.startLine,
+                  startLineType: comment.anchor.multilineMarker.startLineType,
                 }
               : {}),
           },

package/src/bitbucket-service.ts

@@ -23,6 +23,84 @@ function resolveToken(token: string | (() => string | undefined), missingTokenMe
   };
 }
 
+type DiffLineType = 'ADDED' | 'REMOVED' | 'CONTEXT';
+
+/**
+ * Build a Bitbucket DC inline comment anchor.
+ *
+ * For a multiline range, Bitbucket DC (>= 9.3.0) requires `multilineMarker` + `multilineSpan`.
+ * The legacy `multilineStartLine`/`multilineStartLineType`/`multilineAnchor`/`multilineDestinationRange`
+ * fields are silently ignored by the server, which then stores a single-line anchor — so a multiline
+ * `​```suggestion` only replaces its first line on Apply. Field names verified against BB DC 9.3.2.
+ */
+function buildCommentAnchor(params: {
+  filePath: string;
+  line?: number;
+  lineType?: DiffLineType;
+  startLine?: number;
+  startLineType?: DiffLineType;
+}): Record<string, any> {
+  const { filePath, line, lineType } = params;
+  const anchor: Record<string, any> = { path: filePath, diffType: 'EFFECTIVE' };
+  if (line === undefined || !lineType) {
+    return anchor;
+  }
+
+  if (params.startLine === undefined) {
+    anchor.line = line;
+    anchor.lineType = lineType;
+    anchor.fileType = lineType === 'REMOVED' ? 'FROM' : 'TO';
+    return anchor;
+  }
+
+  // Normalize so the marker sits on the lower line and `line` on the upper line.
+  let startLine = params.startLine;
+  let startLineType: DiffLineType = params.startLineType ?? lineType;
+  let endLine = line;
+  let endLineType: DiffLineType = lineType;
+  if (startLine > endLine) {
+    [startLine, endLine] = [endLine, startLine];
+    [startLineType, endLineType] = [endLineType, startLineType];
+  }
+
+  const fileType = endLineType === 'REMOVED' ? 'FROM' : 'TO';
+  anchor.line = endLine;
+  anchor.lineType = endLineType;
+  anchor.fileType = fileType;
+  anchor.multilineMarker = { startLine, startLineType };
+  anchor.multilineSpan =
+    fileType === 'FROM'
+      ? { srcSpanStart: startLine, srcSpanEnd: endLine }
+      : { dstSpanStart: startLine, dstSpanEnd: endLine };
+  return anchor;
+}
+
+const SUGGESTION_BLOCK_RE = /```suggestion\b[^\n]*\n([\s\S]*?)```/;
+
+/**
+ * Warn when a multi-line `​```suggestion` block is anchored to a single line: Bitbucket only replaces
+ * the anchored line on Apply, leaving the rest (duplicated code). Returns undefined when there is no
+ * concern. Heuristic — a 1-line anchor with a multi-line suggestion is the common failure shape.
+ */
+function multilineSuggestionWarning(text: string, startLine?: number): string | undefined {
+  if (startLine !== undefined) {
+    return undefined;
+  }
+  const match = SUGGESTION_BLOCK_RE.exec(text);
+  if (!match) {
+    return undefined;
+  }
+  const suggestionLineCount = match[1].replace(/\n$/, '').split('\n').length;
+  if (suggestionLineCount <= 1) {
+    return undefined;
+  }
+  return (
+    'The comment contains a multi-line ```suggestion block but is anchored to a single line. ' +
+    'On Apply, Bitbucket replaces only that one line and leaves the rest. To replace multiple lines, ' +
+    'set startLine (first replaced line) and line (last replaced line) to span the whole range.'
+  );
+}
+
 export class BitbucketService {
   private readonly getPageSize: () => number;
 
@@ -349,27 +427,11 @@ export class BitbucketService {
 
     // Add anchor for file/line comments
     if (filePath) {
-      comment.anchor = {
-        path: filePath,
-        diffType: 'EFFECTIVE'
-      };
-
-      // Add line-specific anchor properties
-      if (line !== undefined && lineType) {
-        comment.anchor.line = line;
-        comment.anchor.lineType = lineType;
-        comment.anchor.fileType = 'TO'; // Default to destination file
-
-        if (startLine !== undefined) {
-          const resolvedStartLineType = startLineType ?? lineType;
-          comment.anchor.multilineAnchor = true;
-          comment.anchor.multilineStartLine = startLine;
-          comment.anchor.multilineStartLineType = resolvedStartLineType;
-          comment.anchor.multilineDestinationRange = { minimum: startLine, maximum: line };
-        }
-      }
+      comment.anchor = buildCommentAnchor({ filePath, line, lineType, startLine, startLineType });
     }
 
+    const suggestionWarning = filePath ? multilineSuggestionWarning(text, startLine) : undefined;
+
     const result = await handleApiOperation(
       () => PullRequestsService.createComment2(
         projectKey,
@@ -383,10 +445,17 @@ export class BitbucketService {
     if (result.success && result.data && output !== 'full') {
       return {
         ...result,
-        data: shapePullRequestCommentAck(result.data),
+        data: {
+          ...shapePullRequestCommentAck(result.data),
+          ...(suggestionWarning ? { warning: suggestionWarning } : {}),
+        },
       };
     }
 
+    if (result.success && suggestionWarning) {
+      return { ...result, warning: suggestionWarning };
+    }
+
     return result;
   }
 
@@ -824,6 +893,46 @@ export class BitbucketService {
     return result;
   }
 
+  /**
+   * Search code across Bitbucket using the search REST module.
+   *
+   * The query string supports Bitbucket search modifiers, e.g. `project:TEST`,
+   * `repo:projectkey/repositoryslug` (e.g. `repo:TEST/demo`), `ext:js`, so scoping to a
+   * project or repository is done inside the query text. Note: `repo:` must include the
+   * project key (`repo:KEY/slug`); a bare `repo:slug` is rejected by the server.
+   *
+   * Note: the `/rest/search` endpoint is a separate Bitbucket REST module that is not part of
+   * the generated client, so this is issued via the low-level request helper (same approach as
+   * the dashboard/inbox endpoints).
+   *
+   * @param query The search query (may include modifiers like `repo:`, `project:`, `ext:`)
+   * @param limit Optional primary result limit (defaults to the package page size)
+   * @param secondaryLimit Optional secondary limit (number of hit contexts per match)
+   * @returns Promise with the code search results
+   */
+  async searchCode(query: string, limit?: number, secondaryLimit?: number) {
+    return handleApiOperation(
+      () => __request(OpenAPI, {
+        method: 'POST',
+        url: '/search/latest/search',
+        body: {
+          query,
+          entities: { code: {} },
+          limits: {
+            primary: limit ?? this.getPageSize(),
+            ...(secondaryLimit !== undefined ? { secondary: secondaryLimit } : {}),
+          },
+        },
+        mediaType: 'application/json',
+        errors: {
+          400: 'The search query was malformed.',
+          401: 'The currently authenticated user is not permitted to search.',
+        },
+      }),
+      'Error searching code'
+    );
+  }
+
   async validateSetup(): Promise<void> {
     await __request(OpenAPI, {
       method: 'GET',
@@ -911,10 +1020,10 @@ export const bitbucketToolSchemas = {
     text: z.string().describe("The comment text"),
     parentId: z.number().optional().describe("Parent comment ID for replies"),
     filePath: z.string().optional().describe("File path for file-specific comments"),
-    startLine: z.number().optional().describe("Start line of a multiline comment range. When provided together with 'line' (end line), creates a multiline comment spanning from startLine to line."),
-    startLineType: z.enum(['ADDED', 'REMOVED', 'CONTEXT']).optional().describe("Line type for the start line of a multiline comment. Defaults to the same value as lineType if omitted."),
-    line: z.number().optional().describe("Line number for single-line comments, or end line for multiline comments"),
-    lineType: z.enum(['ADDED', 'REMOVED', 'CONTEXT']).optional().describe("Line type for the end line (or the only line for single-line comments)"),
+    startLine: z.number().optional().describe("First line of a multiline range. Provide together with 'line' (the last line) to span multiple lines. REQUIRED for a multi-line ```suggestion: the anchored range (startLine..line) is exactly what 'Apply suggestion' replaces — omit it and only the single 'line' is replaced, leaving the rest. Requires Bitbucket DC >= 9.3.0 for multiline suggestions."),
+    startLineType: z.enum(['ADDED', 'REMOVED', 'CONTEXT']).optional().describe("Line type for the start line of a multiline range. Defaults to the same value as lineType if omitted."),
+    line: z.number().optional().describe("Single-line comments: the line. Multiline: the LAST line of the range (use startLine for the first). For a ```suggestion this is the last replaced line."),
+    lineType: z.enum(['ADDED', 'REMOVED', 'CONTEXT']).optional().describe("Line type for 'line' (the end line, or the only line for single-line comments). Use 'ADDED'/'CONTEXT' for the new/target file, 'REMOVED' for the original/source file."),
     pending: z.boolean().optional().describe("If true, creates a pending (draft) comment not visible to others until the review is submitted via bitbucket_submitPullRequestReview. Only works when filePath is provided — top-level PR comments (no filePath) are always posted live."),
     severity: z.enum(['NORMAL', 'BLOCKER']).optional().describe("Comment severity. Use 'BLOCKER' to post the comment as a task that must be resolved before the PR can be merged. Defaults to 'NORMAL' (regular comment)."),
     output: z.enum(['ack', 'full']).optional().describe("Return a compact acknowledgement or the full API response. Defaults to ack.")
@@ -995,5 +1104,10 @@ export const bitbucketToolSchemas = {
   getInboxPullRequests: {
     start: z.number().optional().describe("Start number for the page (inclusive). If not passed, first page is assumed"),
     limit: z.number().optional().describe("Number of items to return. If not passed, the package default page size is used.")
+  },
+  searchCode: {
+    query: z.string().describe("The search query. Supports Bitbucket search modifiers, e.g. 'project:TEST authenticate', 'repo:TEST/demo TODO' (the repo modifier must be 'repo:projectkey/repositoryslug'), 'ext:ts useState'. Scope to a project or repository inside the query text."),
+    limit: z.number().optional().describe("Maximum number of matching files to return. If not passed, the package default page size is used."),
+    secondaryLimit: z.number().optional().describe("Maximum number of hit contexts (matching code snippets) to return per file")
   }
 };

package/src/index.ts

@@ -218,4 +218,14 @@ server.tool(
   }
 );
 
+server.tool(
+  "bitbucket_searchCode",
+  "Search code across Bitbucket. The query supports search modifiers like 'project:<key>', 'repo:<key>/<slug>', and 'ext:<extension>' to scope or filter results (e.g. 'project:TEST authenticate', 'repo:TEST/demo ext:js TODO'). NOTE: the 'repo:' modifier requires the project key — 'repo:projectkey/repositoryslug', not a bare slug. Returns matching files with hit contexts (snippets).",
+  bitbucketToolSchemas.searchCode,
+  async ({ query, limit, secondaryLimit }) => {
+    const result = await bitbucketService.searchCode(query, limit, secondaryLimit);
+    return formatToolResponse(result);
+  }
+);
+
 await connectServer(server);

package/src/pr-comment-mapper.ts

@@ -24,6 +24,10 @@ interface CommentAnchor {
   path: string;
   diffType: string;
   orphaned: boolean;
+  multilineMarker?: {
+    startLine: number;
+    startLineType: string;
+  };
 }
 
 interface CommentProperties {
@@ -131,6 +135,8 @@ interface SimplifiedAnchor {
   line: number;
   path: string;
   fileType?: string;
+  startLine?: number;
+  startLineType?: string;
 }
 
 interface SimplifiedComment {
@@ -240,7 +246,13 @@ function simplifyAnchor(anchor: CommentAnchor): SimplifiedAnchor {
   return {
     line: anchor.line,
     path: anchor.path,
-    fileType: anchor.fileType
+    fileType: anchor.fileType,
+    ...(anchor.multilineMarker
+      ? {
+          startLine: anchor.multilineMarker.startLine,
+          startLineType: anchor.multilineMarker.startLineType
+        }
+      : {})
   };
 }