@stubbedev/atlassian-mcp 0.3.0 → 0.3.2

package/dist/bitbucket.js

@@ -84,6 +84,7 @@ function commentMatchesState(comment, state) {
         const threadState = comment.threadResolved ? 'RESOLVED' : 'OPEN';
         if (threadState === state)
             return true;
+        return (comment.comments ?? []).some((child) => commentMatchesState(child, state));
     }
     const currentState = comment.state ?? 'OPEN';
     if (currentState === state)
@@ -125,7 +126,7 @@ function uniqueCommentsFromActivities(activities) {
     }
     return Array.from(byId.values())
         .filter((comment) => !comment.deleted)
-        .sort((a, b) => (a.createdDate ?? 0) - (b.createdDate ?? 0));
+        .sort((a, b) => (b.createdDate ?? 0) - (a.createdDate ?? 0));
 }
 function pageHint(data) {
     return data.isLastPage ? '' : ` (use start=${data.nextPageStart} for next page)`;
@@ -237,6 +238,9 @@ export class BitbucketClient {
         this.currentUsernameCache = username;
         return username;
     }
+    async whoami() {
+        return this.getCurrentUsername();
+    }
     /** Returns a URL-safe `/projects/.../repos/...` prefix for REST paths. */
     rp(projectKey, repoSlug) {
         return `/projects/${encodeURIComponent(projectKey)}/repos/${encodeURIComponent(repoSlug)}`;
@@ -532,13 +536,15 @@ export class BitbucketClient {
         if (includeComments) {
             const commentsLimit = args.commentsLimit ?? 50;
             const commentsStart = args.commentsStart ?? 0;
-            const commentsState = args.commentsState ?? 'OPEN';
+            const commentsState = args.commentsState ?? 'ALL';
             const commentsSeverity = args.commentsSeverity ?? 'ALL';
             if (commentsSeverity === 'BLOCKER' && commentsState === 'PENDING') {
-                throw new Error('commentsState=PENDING is not valid when commentsSeverity=BLOCKER. Use OPEN or RESOLVED.');
+                throw new Error('commentsState=PENDING is not valid when commentsSeverity=BLOCKER. Use OPEN, RESOLVED, or ALL.');
             }
             if (commentsSeverity === 'BLOCKER') {
-                const qs = new URLSearchParams({ limit: String(commentsLimit), start: String(commentsStart), state: commentsState });
+                const qs = new URLSearchParams({ limit: String(commentsLimit), start: String(commentsStart) });
+                if (commentsState !== 'ALL')
+                    qs.set('state', commentsState);
                 const data = await this.request('GET', `${this.rp(projectKey, repoSlug)}/pull-requests/${prId}/blocker-comments?${qs}`);
                 if (!data || data.values.length === 0) {
                     sections.push(`Comments:\n(no ${commentsState} BLOCKER comments)`);
@@ -553,7 +559,7 @@ export class BitbucketClient {
             else {
                 const activityData = await this.request('GET', `${this.rp(projectKey, repoSlug)}/pull-requests/${prId}/activities?limit=${commentsLimit}&start=${commentsStart}`);
                 const comments = uniqueCommentsFromActivities(activityData?.values ?? []).filter((comment) => {
-                    const matchesState = commentMatchesState(comment, commentsState);
+                    const matchesState = commentsState === 'ALL' ? true : commentMatchesState(comment, commentsState);
                     return matchesState && commentMatchesSeverity(comment, commentsSeverity);
                 });
                 for (const comment of comments)
@@ -564,7 +570,7 @@ export class BitbucketClient {
                 else {
                     const blocks = comments.flatMap((comment) => formatCommentThread(comment));
                     const paging = activityData ? pageHint(activityData) : '';
-                    sections.push(`Comments (${comments.length} thread(s))${paging}:\n\n${blocks.join('\n\n')}`);
+                    sections.push(`Comments (${comments.length} thread(s), newest first)${paging}:\n\n${blocks.join('\n\n')}`);
                 }
             }
         }

package/dist/context.js

@@ -9,6 +9,27 @@ function safeExec(cmd, cwd) {
         return '';
     }
 }
+/** Top recent committers from the last `lookback` commits, ranked by count. */
+export function getTopCommitters(repoPath, lookback = 50, top = 5) {
+    const raw = safeExec(`git log -n ${lookback} --format=%aN%x09%aE`, repoPath);
+    if (!raw)
+        return [];
+    const counts = new Map();
+    for (const line of raw.split('\n')) {
+        const [name, email] = line.split('\t');
+        if (!name)
+            continue;
+        const key = (email || name).toLowerCase();
+        const existing = counts.get(key);
+        if (existing)
+            existing.commits++;
+        else
+            counts.set(key, { name, email: email ?? '', commits: 1 });
+    }
+    return [...counts.values()]
+        .sort((a, b) => b.commits - a.commits)
+        .slice(0, top);
+}
 /**
  * Unified developer context: git state + linked Jira issues + open PR for current branch.
  * Either jira or bitbucket may be null when only one product is configured.
@@ -20,6 +41,8 @@ export async function getDevContext(args, jira, bitbucket) {
     const remote = safeExec('git remote get-url origin', repoPath) || '(no remote)';
     const recentCommits = safeExec('git log --oneline -5', repoPath) || '(none)';
     const status = safeExec('git status --short', repoPath) || '(clean)';
+    const committers = getTopCommitters(repoPath, 50, 5);
+    const parsed = bitbucket?.isRemoteForThisInstance(remote) ? parseBitbucketRemote(remote) : null;
     // Upstream ahead/behind
     const upstream = safeExec('git rev-parse --abbrev-ref @{u}', repoPath);
     let upstreamLine = '';
@@ -35,18 +58,40 @@ export async function getDevContext(args, jira, bitbucket) {
             upstreamLine = `${upstream}${parts.length ? ` (${parts.join(', ')})` : ' (up to date)'}`;
         }
     }
-    sections.push([
+    // Identity — best-effort, parallel
+    const [jiraMe, bbMe] = await Promise.all([
+        jira ? jira.whoami().catch(() => null) : Promise.resolve(null),
+        bitbucket ? bitbucket.whoami().catch(() => null) : Promise.resolve(null),
+    ]);
+    const youParts = [];
+    if (jiraMe)
+        youParts.push(`Jira ${jiraMe.name ?? jiraMe.key ?? '(unknown)'}${jiraMe.displayName ? ` "${jiraMe.displayName}"` : ''}`);
+    if (bbMe)
+        youParts.push(`Bitbucket ${bbMe}`);
+    const headerLines = [
         `Repository: ${repoPath}`,
         `Branch:     ${branch}`,
         ...(upstreamLine ? [`Upstream:   ${upstreamLine}`] : []),
         `Remote:     ${remote}`,
-        '',
-        'Recent commits:',
-        recentCommits,
-        '',
-        'Working tree:',
-        status,
-    ].join('\n'));
+        ...(parsed ? [`Bitbucket:  ${parsed.projectKey}/${parsed.repoSlug}`] : []),
+        ...(youParts.length ? [`You:        ${youParts.join(' · ')}`] : []),
+    ];
+    if (committers.length) {
+        headerLines.push('');
+        headerLines.push('Top recent committers (last 50):');
+        for (const c of committers) {
+            const ident = c.email ? `${c.name} <${c.email}>` : c.name;
+            headerLines.push(`  ${c.commits.toString().padStart(3)} — ${ident}`);
+        }
+        headerLines.push('  (look up usernames via jira_search resource=users / bitbucket_search resource=users — do NOT shell out to git/gh/bb)');
+    }
+    headerLines.push('');
+    headerLines.push('Recent commits:');
+    headerLines.push(recentCommits);
+    headerLines.push('');
+    headerLines.push('Working tree:');
+    headerLines.push(status);
+    sections.push(headerLines.join('\n'));
     // Jira — fetch overview for any tickets referenced in the branch name (parallel)
     const jiraKeys = jira ? [...new Set(branch.match(JIRA_KEY_RE) ?? [])] : [];
     const jiraResults = await Promise.all(jiraKeys.map(async (key) => {
@@ -66,7 +111,6 @@ export async function getDevContext(args, jira, bitbucket) {
     }));
     sections.push(...jiraResults);
     // Bitbucket — find the open PR for this branch (only if remote points to this instance)
-    const parsed = bitbucket?.isRemoteForThisInstance(remote) ? parseBitbucketRemote(remote) : null;
     if (parsed) {
         try {
             const pr = await bitbucket.findOpenPrForBranch(parsed.projectKey, parsed.repoSlug, branch);

package/dist/index.js

@@ -12,7 +12,7 @@ import { loadConfig } from './config.js';
 import { JiraClient } from './jira.js';
 import { BitbucketClient, parseBitbucketRemote } from './bitbucket.js';
 import { getContext, getDiff, createBranch, checkRemoteBranch, checkoutRemoteBranch } from './git.js';
-import { getDevContext } from './context.js';
+import { getDevContext, getTopCommitters } from './context.js';
 function currentGitRemote() {
     try {
         return execFileSync('git', ['remote', 'get-url', 'origin'], { encoding: 'utf-8' }).trim();
@@ -21,6 +21,14 @@ function currentGitRemote() {
         return '';
     }
 }
+function currentGitBranch() {
+    try {
+        return execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { encoding: 'utf-8' }).trim();
+    }
+    catch {
+        return '';
+    }
+}
 function remoteMatchesBitbucketInstance(remote, bitbucketUrl) {
     if (!remote)
         return false;
@@ -39,7 +47,57 @@ const bitbucket = (config.bitbucket && remoteMatchesBitbucketInstance(_remote, c
 if (config.bitbucket && !bitbucket) {
     console.error(`[atlassian-mcp] Bitbucket configured but remote "${_remote || '(none)'}" does not match ${config.bitbucket.url} — Bitbucket tools disabled for this repo.`);
 }
-const server = new Server({ name: 'atlassian-mcp', version: _pkg.version }, { capabilities: { tools: {} } });
+async function buildInstructions() {
+    const branch = currentGitBranch();
+    const isGitRepo = branch !== '';
+    const jiraKeys = isGitRepo ? [...new Set(branch.match(/\b[A-Z][A-Z0-9]+-\d+\b/g) ?? [])] : [];
+    const parsed = bitbucket && _remote ? parseBitbucketRemote(_remote) : null;
+    const committers = isGitRepo ? getTopCommitters(process.cwd(), 50, 5) : [];
+    const [jiraMe, bbMe] = await Promise.all([
+        jira ? jira.whoami().catch(() => null) : Promise.resolve(null),
+        bitbucket ? bitbucket.whoami().catch(() => null) : Promise.resolve(null),
+    ]);
+    const lines = [];
+    lines.push('# atlassian-mcp');
+    lines.push('');
+    lines.push('Self-hosted Jira + Bitbucket Server tooling. Prefer these tools over shelling out to `git log`, `gh`, or any `bitbucket`/`bb` CLI for anything that touches tickets, PRs, reviewers, comments, or user lookups.');
+    lines.push('');
+    lines.push('## Configured services');
+    lines.push(`- Jira:      ${jira ? config.jira.url : '(not configured)'}${jiraMe ? ` — you are ${jiraMe.name ?? jiraMe.key ?? '?'}${jiraMe.displayName ? ` "${jiraMe.displayName}"` : ''}` : ''}`);
+    lines.push(`- Bitbucket: ${bitbucket ? config.bitbucket.url : (config.bitbucket ? `${config.bitbucket.url} — DISABLED for this cwd (remote does not match)` : '(not configured)')}${bbMe ? ` — you are ${bbMe}` : ''}`);
+    lines.push('');
+    if (isGitRepo) {
+        lines.push('## Current repo');
+        lines.push(`- Branch: ${branch} (may have changed since startup — re-run \`get_dev_context\` to refresh)`);
+        lines.push(`- Remote: ${_remote || '(none)'}`);
+        if (parsed)
+            lines.push(`- Bitbucket repo: ${parsed.projectKey}/${parsed.repoSlug}`);
+        if (jiraKeys.length)
+            lines.push(`- Jira keys in branch: ${jiraKeys.join(', ')}`);
+    }
+    else {
+        lines.push('## Current repo');
+        lines.push('- Not a git repository.');
+    }
+    if (committers.length) {
+        lines.push('');
+        lines.push('## Recent committers in this repo (last 50 commits)');
+        for (const c of committers) {
+            const ident = c.email ? `${c.name} <${c.email}>` : c.name;
+            lines.push(`- ${c.commits}× ${ident}`);
+        }
+    }
+    lines.push('');
+    lines.push('## Use these tools — do NOT shell out');
+    lines.push('- "What am I working on / what\'s the status / show me the context" → call `get_dev_context` first. It returns branch state, linked Jira tickets, the open PR, and reviewer status in one shot.');
+    lines.push('- Looking up a person\'s username (for reviewers, assignees, mentions) → ALWAYS use `bitbucket_search resource=users` or `jira_search resource=users`. NEVER use `git log`/`git shortlog`/`gh api`/`bb`/any bitbucket CLI to discover who someone is — those return commit-author strings, not Bitbucket/Jira usernames, and the wrong identifier breaks reviewer assignment.');
+    lines.push('- Reading a Jira ticket → `jira_get` (single) or `jira_search` (many). Mutating → `jira_mutate`.');
+    lines.push('- Reading a PR → `bitbucket_get_pr`. Creating/updating/merging → `bitbucket_mutate`. Commenting → `bitbucket_comment`.');
+    lines.push('- Starting work on a ticket (branch + status transition + README) → `start_work`. Closing it (merge + transition) → `complete_work`.');
+    return lines.join('\n');
+}
+const _instructions = await buildInstructions();
+const server = new Server({ name: 'atlassian-mcp', version: _pkg.version }, { capabilities: { tools: {} }, instructions: _instructions });
 server.onerror = (error) => console.error('[MCP Error]', error);
 function normalizeBitbucketArgs(args) {
     const src = (args && typeof args === 'object') ? args : {};
@@ -314,7 +372,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
                         includeComments: { type: 'boolean', description: 'Include review comments and blockers (default true)', default: true },
                         includeDiff: { type: 'boolean', description: 'Include diff text (default false)', default: false },
                         includeBuildStatus: { type: 'boolean', description: 'Include CI/build status for the head commit (default true)', default: true },
-                        commentsState: { type: 'string', enum: ['OPEN', 'RESOLVED', 'PENDING'], description: 'Comment state filter (default OPEN)', default: 'OPEN' },
+                        commentsState: { type: 'string', enum: ['ALL', 'OPEN', 'RESOLVED', 'PENDING'], description: 'Comment state filter (default ALL — returns every comment with its state badge so nothing is silently hidden). Pass OPEN/RESOLVED only when explicitly narrowing.', default: 'ALL' },
                         commentsSeverity: { type: 'string', enum: ['ALL', 'NORMAL', 'BLOCKER'], description: 'Comment severity filter (default ALL)', default: 'ALL' },
                         commentsLimit: { type: 'number', description: 'Max comments (default 50)', default: 50 },
                         commentsStart: { type: 'number', description: 'Comment pagination offset (default 0)', default: 0 },

package/dist/jira.js

@@ -149,6 +149,9 @@ export class JiraClient {
         this.currentUserCache = me;
         return me;
     }
+    async whoami() {
+        return this.getCurrentUser();
+    }
     async getIssueLinkingEnabled() {
         if (this.issueLinkingEnabled !== undefined)
             return this.issueLinkingEnabled;

package/package.json

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