@stubbedev/atlassian-mcp 0.2.7 → 0.2.9

package/README.md

@@ -39,7 +39,7 @@ A [Model Context Protocol](https://modelcontextprotocol.io) (MCP) server for **s
 | `bitbucket_search` | Discover resources: `pull_requests` (default), `repos`, or `branches` via `resource` param; `mine=true` for your inbox |
 | `bitbucket_get_pr` | Full PR details: metadata, commits, comments, blockers, build status, and optional diff |
 | `bitbucket_mutate` | Create/update a PR, or perform lifecycle actions: `approve`, `unapprove`, `merge`, `decline` |
-| `bitbucket_comment` | Add, update, or delete a PR comment; supports inline anchors, multiline, suggestions, and BLOCKER severity |
+| `bitbucket_comment` | Add, update, or delete a PR comment; for code changes use `suggestion` so Bitbucket shows Apply suggestion (no trailing text after a suggestion block) |
 | `bitbucket_get_file` | Raw file content from Bitbucket at a branch, tag, or commit |
 | `bitbucket_pr_tasks` | Manage PR tasks (checklist items): `list`, `create`, `resolve`, `reopen`, `delete` |
 

package/dist/bitbucket.js

@@ -180,10 +180,22 @@ function validateCommentText(textValue) {
     }
     return trimmed;
 }
+function validateSuggestionPlacement(textValue) {
+    if (!textValue.includes('```suggestion'))
+        return;
+    const match = textValue.match(/```suggestion[^\n]*\n[\s\S]*?\n```/);
+    if (!match || match.index === undefined) {
+        throw new Error('Invalid suggestion block format. Use the suggestion field to post code suggestions.');
+    }
+    const trailingText = textValue.slice(match.index + match[0].length).trim();
+    if (trailingText.length > 0) {
+        throw new Error('When using ```suggestion```, do not add text after the closing code fence. Put any explanation before the suggestion block or use the suggestion field.');
+    }
+}
 export class BitbucketClient {
     baseUrl;
     headers;
-    currentUserCache;
+    currentUsernameCache;
     constructor(baseUrl, token) {
         this.baseUrl = baseUrl.replace(/\/$/, '');
         this.headers = {
@@ -192,6 +204,18 @@ export class BitbucketClient {
             Accept: 'application/json',
         };
     }
+    /** Returns the slug/username of the authenticated user via the X-AUSERNAME response header. */
+    async getCurrentUsername() {
+        if (this.currentUsernameCache)
+            return this.currentUsernameCache;
+        const url = `${this.baseUrl}/rest/api/1.0/application-properties`;
+        const res = await fetch(url, { method: 'GET', headers: this.headers });
+        const username = res.headers.get('X-AUSERNAME');
+        if (!username)
+            throw new Error('Could not determine current Bitbucket user. Check token permissions.');
+        this.currentUsernameCache = username;
+        return username;
+    }
     /** Returns a URL-safe `/projects/.../repos/...` prefix for REST paths. */
     rp(projectKey, repoSlug) {
         return `/projects/${encodeURIComponent(projectKey)}/repos/${encodeURIComponent(repoSlug)}`;
@@ -278,38 +302,6 @@ export class BitbucketClient {
         }
         return res.status === 204 ? null : res.json();
     }
-    normalizeIdentity(value) {
-        return (value ?? '').trim().toLowerCase();
-    }
-    async getCurrentUser() {
-        if (this.currentUserCache)
-            return this.currentUserCache;
-        const me = await this.request('GET', '/users/~self');
-        if (!me) {
-            throw new Error('Could not determine current Bitbucket user identity.');
-        }
-        this.currentUserCache = me;
-        return me;
-    }
-    async assertOwnComment(comment) {
-        const me = await this.getCurrentUser();
-        const commentAuthorName = this.normalizeIdentity(comment.author?.name);
-        const commentAuthorDisplayName = this.normalizeIdentity(comment.author?.displayName);
-        const meName = this.normalizeIdentity(me.name);
-        const meSlug = this.normalizeIdentity(me.slug);
-        const meDisplayName = this.normalizeIdentity(me.displayName);
-        const hasStrongCommentIdentity = commentAuthorName.length > 0;
-        const hasStrongUserIdentity = meName.length > 0 || meSlug.length > 0;
-        const matchesByName = commentAuthorName.length > 0 && (commentAuthorName === meName || commentAuthorName === meSlug);
-        const matchesByDisplayNameFallback = !hasStrongCommentIdentity
-            && !hasStrongUserIdentity
-            && commentAuthorDisplayName.length > 0
-            && commentAuthorDisplayName === meDisplayName;
-        if (matchesByName || matchesByDisplayNameFallback) {
-            return;
-        }
-        throw new Error(`You can only edit your own Bitbucket comments. Comment #${comment.id} is authored by ${comment.author?.displayName ?? comment.author?.name ?? 'another user'}.`);
-    }
     /** Returns true if the given remote URL belongs to this Bitbucket instance. */
     isRemoteForThisInstance(remoteUrl) {
         return this.remoteMatchesInstance(remoteUrl);
@@ -367,10 +359,7 @@ export class BitbucketClient {
     }
     async myPrs(args) {
         const { limit = 25, start = 0, role } = args;
-        const me = await this.getCurrentUser();
-        const userSlug = me.slug ?? me.name;
-        if (!userSlug)
-            throw new Error('Could not determine your Bitbucket user slug. Check token permissions.');
+        const userSlug = await this.getCurrentUsername();
         const qs = new URLSearchParams({ limit: String(limit), start: String(start), state: 'OPEN' });
         if (role)
             qs.set('role', role.toUpperCase());
@@ -424,28 +413,12 @@ export class BitbucketClient {
                 throw new Error(`No open PR found for branch "${branchDisplayId(branch)}".`);
             prId = found.id;
         }
-        const [pr, me] = await Promise.all([
-            this.request('GET', `${this.rp(projectKey, repoSlug)}/pull-requests/${prId}`),
-            this.getCurrentUser().catch(() => null),
-        ]);
+        const pr = await this.request('GET', `${this.rp(projectKey, repoSlug)}/pull-requests/${prId}`);
         if (!pr)
             return text('Pull request not found.');
         const sections = [];
         const reviewers = pr.reviewers.map((r) => `${r.user.displayName}${r.approved ? ' ✓' : ''}`).join(', ');
         const url = pr.links?.self?.[0]?.href;
-        // Prefer slug (canonical unique identifier), fall back to username (name field).
-        // Display name is deliberately excluded — it is not unique.
-        const meSlug = this.normalizeIdentity(me?.slug);
-        const meName = this.normalizeIdentity(me?.name);
-        const authorSlug = this.normalizeIdentity(pr.author.user.slug);
-        const authorName = this.normalizeIdentity(pr.author.user.name);
-        const isAuthor = me
-            ? (meSlug && authorSlug ? meSlug === authorSlug : false) ||
-                (meName && authorName ? meName === authorName : false)
-            : false;
-        const viewingAs = me
-            ? `Viewing as: ${me.displayName} (${isAuthor ? 'you are the author' : 'you are a reviewer'})`
-            : '';
         const header = [
             `PR #${pr.id}: ${pr.title}`,
             `State:     ${pr.state}`,
@@ -453,7 +426,6 @@ export class BitbucketClient {
             `Branch:    ${pr.fromRef.displayId} → ${pr.toRef.displayId}`,
             `Reviewers: ${reviewers || 'None'}`,
             url ? `URL:       ${url}` : '',
-            viewingAs,
             '',
             'Description:',
             pr.description ?? '(no description)',
@@ -850,10 +822,21 @@ export class BitbucketClient {
                 || args.multilineStartLineType !== undefined)) {
             throw new Error('Replies must target an existing comment thread only. Omit filePath/line and other anchor fields when replying.');
         }
-        let commentText = args.text;
+        if (args.text === undefined && args.suggestion === undefined) {
+            throw new Error('Either text or suggestion is required when adding a comment.');
+        }
+        let commentText = args.text ?? '';
         if (args.suggestion !== undefined) {
-            const suggestionBlock = `\`\`\`suggestion\n${args.suggestion}\n\`\`\``;
-            commentText = args.text ? `${args.text}\n\n${suggestionBlock}` : suggestionBlock;
+            const suggestion = args.suggestion.trim();
+            if (!suggestion) {
+                throw new Error('suggestion must not be empty.');
+            }
+            const suggestionBlock = `\`\`\`suggestion\n${suggestion}\n\`\`\``;
+            const prefix = (args.text ?? '').trim();
+            commentText = prefix ? `${prefix}\n\n${suggestionBlock}` : suggestionBlock;
+        }
+        else {
+            validateSuggestionPlacement(commentText);
         }
         const body = { text: validateCommentText(commentText) };
         if (args.severity)
@@ -918,13 +901,6 @@ export class BitbucketClient {
         if (!current)
             throw new Error(`Comment #${args.commentId} not found.`);
         const currentSeverity = current.severity ?? 'NORMAL';
-        const severityIsChanging = args.severity !== undefined && args.severity !== currentSeverity;
-        const isResolutionOnlyUpdate = (args.state !== undefined || args.threadResolved !== undefined)
-            && args.text === undefined
-            && !severityIsChanging;
-        if (!isResolutionOnlyUpdate) {
-            await this.assertOwnComment(current);
-        }
         const targetSeverity = args.severity ?? currentSeverity;
         if (args.state && targetSeverity !== 'BLOCKER') {
             throw new Error('state is only supported for BLOCKER comments (tasks). Use threadResolved for normal comment threads.');
@@ -974,7 +950,6 @@ export class BitbucketClient {
         const current = await this.request('GET', `${this.rp(projectKey, repoSlug)}/pull-requests/${args.prId}/comments/${args.commentId}`);
         if (!current)
             throw new Error(`Comment #${args.commentId} not found.`);
-        await this.assertOwnComment(current);
         const commentPath = current.severity === 'BLOCKER'
             ? `${this.rp(projectKey, repoSlug)}/pull-requests/${args.prId}/blocker-comments/${args.commentId}`
             : `${this.rp(projectKey, repoSlug)}/pull-requests/${args.prId}/comments/${args.commentId}`;

package/dist/index.js

@@ -348,7 +348,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             },
             {
                 name: 'bitbucket_comment',
-                description: `Add, update, or delete a PR comment. action defaults to "add". For review feedback, prefer inline comments with a code suggestion. Replies MUST use commentId. Keep comments concise, no emojis. Only call proactively (without being asked) when you are a reviewer on the PR (i.e. "Viewing as" says "you are a reviewer") — never post unsolicited comments on PRs you authored.`,
+                description: `Add, update, or delete a PR comment. action defaults to "add". For code changes, ALWAYS use inline comments with suggestion when exact replacement code is available. Keep any explanatory text before the suggestion block only (never after), or Bitbucket may hide Apply suggestion. Replies MUST use commentId. Keep comments concise, no emojis. Only call proactively (without being asked) when you are a reviewer on the PR (i.e. "Viewing as" says "you are a reviewer") — never post unsolicited comments on PRs you authored.`,
                 inputSchema: {
                     type: 'object',
                     properties: {
@@ -359,7 +359,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
                         repo: { type: 'string', description: 'Alias for repoSlug' },
                         prId: { type: 'number', description: 'Pull request number' },
                         commentId: { type: 'number', description: 'Comment ID to reply to, update, or delete' },
-                        text: { type: 'string', description: 'Comment text. No filler, no emojis. Required for add/update.' },
+                        text: { type: 'string', description: 'Comment text for add/update. No filler, no emojis. If suggestion is used, keep this optional and brief; it is placed before the suggestion block.' },
                         filePath: { type: 'string', description: 'File path for inline comment (must pair with line)' },
                         srcPath: { type: 'string', description: 'Source path if file was renamed (optional, defaults to filePath)' },
                         line: { type: 'number', description: 'Line number to anchor inline comment (must pair with filePath)' },
@@ -367,7 +367,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
                         fileType: { type: 'string', enum: ['TO', 'FROM'], description: 'Diff side: TO (new, default) or FROM (old)' },
                         multilineStartLine: { type: 'number', description: 'First line of multiline anchor (pair with line as last line)' },
                         multilineStartLineType: { type: 'string', enum: ['ADDED', 'REMOVED', 'CONTEXT'], description: 'Line type for multilineStartLine' },
-                        suggestion: { type: 'string', description: 'Replacement code to suggest (strongly preferred for code changes). Requires filePath + line.' },
+                        suggestion: { type: 'string', description: 'Replacement code to suggest. Use whenever proposing a concrete code change. Posted as the final ```suggestion``` block so Apply suggestion appears. Requires filePath + line.' },
                         state: { type: 'string', enum: ['OPEN', 'RESOLVED'], description: 'Task state for BLOCKER comments (update only)' },
                         threadResolved: { type: 'boolean', description: 'Resolve/reopen normal comment thread (update only)' },
                         severity: { type: 'string', enum: ['NORMAL', 'BLOCKER'], description: 'Comment severity. BLOCKER = checklist task.' },

package/package.json

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