@stubbedev/atlassian-mcp 0.1.12 → 0.1.13

package/dist/bitbucket.js

@@ -690,25 +690,47 @@ export class BitbucketClient {
         const body = { text: validateCommentText(commentText) };
         if (args.parentCommentId)
             body.parent = { id: args.parentCommentId };
-        if (args.filePath !== undefined && args.line !== undefined) {
+        let inlineAnchor;
+        if (args.filePath !== undefined || args.line !== undefined) {
+            if (args.filePath === undefined || args.line === undefined) {
+                throw new Error('filePath and line must be provided together for inline comments.');
+            }
             const pr = await this.request('GET', `/projects/${projectKey}/repos/${repoSlug}/pull-requests/${args.prId}`);
-            const anchor = {
+            inlineAnchor = {
                 diffType: 'EFFECTIVE',
                 fileType: args.fileType ?? 'TO',
-                fromHash: pr?.fromRef.latestCommit ?? '',
-                toHash: pr?.toRef.latestCommit ?? '',
                 line: args.line,
                 lineType: args.lineType ?? 'ADDED',
                 path: args.filePath,
-                srcPath: args.srcPath ?? args.filePath,
             };
+            if (args.srcPath !== undefined) {
+                inlineAnchor.srcPath = args.srcPath;
+            }
+            const fromHash = pr?.toRef.latestCommit;
+            const toHash = pr?.fromRef.latestCommit;
+            if (fromHash && toHash) {
+                inlineAnchor.fromHash = fromHash;
+                inlineAnchor.toHash = toHash;
+            }
             if (args.multilineStartLine !== undefined) {
-                anchor.multilineStartLine = args.multilineStartLine;
-                anchor.multilineStartLineType = args.multilineStartLineType ?? args.lineType ?? 'ADDED';
+                inlineAnchor.multilineStartLine = args.multilineStartLine;
+                inlineAnchor.multilineStartLineType = args.multilineStartLineType ?? args.lineType ?? 'ADDED';
+            }
+            body.anchor = inlineAnchor;
+        }
+        let created;
+        try {
+            created = await this.request('POST', `/projects/${projectKey}/repos/${repoSlug}/pull-requests/${args.prId}/comments`, body);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (!inlineAnchor || !message.includes('Bitbucket 409') || !('fromHash' in inlineAnchor) || !('toHash' in inlineAnchor)) {
+                throw error;
             }
-            body.anchor = anchor;
+            const { fromHash: _fromHash, toHash: _toHash, ...anchorWithoutHashes } = inlineAnchor;
+            body.anchor = anchorWithoutHashes;
+            created = await this.request('POST', `/projects/${projectKey}/repos/${repoSlug}/pull-requests/${args.prId}/comments`, body);
         }
-        const created = await this.request('POST', `/projects/${projectKey}/repos/${repoSlug}/pull-requests/${args.prId}/comments`, body);
         if (!created)
             return text(`Comment added to PR #${args.prId}.`);
         if (args.parentCommentId) {

package/dist/index.js

@@ -44,7 +44,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         // ── Context ───────────────────────────────────────────────────────────
         {
             name: 'get_dev_context',
-            description: 'Use when you want one quick snapshot before coding or reviewing: current git branch/status, Jira tickets detected from branch name, and the open Bitbucket PR for that branch.',
+            description: 'Use when you want one quick snapshot before coding or reviewing: current git branch/status, Jira tickets detected from branch name, and the open Bitbucket PR for that branch. For review requests, use this first to resolve the branch and PR without assuming it is in your personal inbox.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -311,7 +311,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: 'bitbucket_list_pull_requests',
-            description: 'Use when you want pull requests for a repo (open, merged, or declined) with pagination. You can pass projectKey/repoSlug or project/repo.',
+            description: 'Use when you want pull requests for a repo (open, merged, or declined) with pagination. Primary review-discovery flow: resolve the branch, then filter by fromBranch to find the PR for that branch (do not assume it is your own PR). You can pass projectKey/repoSlug or project/repo.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -329,7 +329,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: 'bitbucket_my_prs',
-            description: 'Use when you want your personal PR inbox (reviews requested, authored by you, or participated PRs).',
+            description: 'Use only when you explicitly want your personal PR inbox (reviews requested, authored by you, or participated PRs). Do not use this for branch-based review targeting.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -356,7 +356,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: 'bitbucket_get_pr_overview',
-            description: 'Use when you want one bulk PR snapshot in a single call: metadata, commits, comments, task-style BLOCKER comments, and optional diff.',
+            description: 'Use when you want one bulk PR snapshot in a single call: metadata, commits, comments, task-style BLOCKER comments, and optional diff. If prId is unknown during review, discover it from branch context first (get_dev_context or bitbucket_list_pull_requests with fromBranch).',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -548,7 +548,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: 'bitbucket_get_pr_comments',
-            description: 'Use when you want PR review discussion in bulk: comment threads, task-style BLOCKER comments, and blocker counts with pagination. You can pass projectKey/repoSlug or project/repo.',
+            description: 'Use when you want PR review discussion in bulk: comment threads, task-style BLOCKER comments, and blocker counts with pagination. For review tasks, locate PR by branch first instead of assuming it is in your inbox. You can pass projectKey/repoSlug or project/repo.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -571,6 +571,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             name: 'bitbucket_add_pr_comment',
             description: `Add a PR review comment or reply to an existing thread.
 
+FOR REVIEW FEEDBACK, DEFAULT TO INLINE + EXAMPLE: Prefer anchored inline comments with a concrete code change example (suggestion) over top-level prose. Use top-level comments only for overall PR-wide feedback.
+
 INLINE COMMENTS ARE STRONGLY PREFERRED: Whenever your comment refers to a specific line or block of code, you MUST provide filePath and line to anchor it as an inline comment on the diff. General top-level comments (no filePath/line) should only be used for overall PR feedback that does not relate to any particular line.
 
 SUGGESTIONS ARE STRONGLY PREFERRED OVER PLAIN COMMENTS: When you are pointing out something that should be changed, always provide a suggestion (the corrected code) rather than describing the change in words. A suggestion lets the author apply the fix with one click. Only omit suggestion if you are asking a question or raising a concern that has no clear single answer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stubbedev/atlassian-mcp",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "MCP server for self-hosted Jira and Bitbucket",
   "license": "MIT",
   "type": "module",