@stubbedev/atlassian-mcp 0.2.3 → 0.2.5

package/README.md

@@ -8,84 +8,58 @@ A [Model Context Protocol](https://modelcontextprotocol.io) (MCP) server for **s
 
 ## Tools
 
-### Context
+### Workflow
 
 | Tool | Description |
 |---|---|
-| `get_dev_context` | One-shot coding context: local git state + linked Jira tickets + open PR for current branch |
+| `get_dev_context` | Master entry point: git state + linked Jira ticket + open PR with reviewer/blocker status and next-step hints |
+| `start_work` | Start a Jira ticket: fetches it, creates a local branch (`feature/FOO-123-slug`), and optionally transitions the ticket |
+| `complete_work` | Close out finished work: merges the open PR and transitions the Jira ticket to Done |
 
-### Jira
+### Git
 
 | Tool | Description |
 |---|---|
-| `jira_search_issues` | Find tickets by plain language, JQL, project, status, assignee, or type |
-| `jira_my_issues` | List issues assigned to you, ordered by last updated |
-| `jira_get_projects` | List all accessible projects |
-| `jira_get_issue_types` | List issue types and their available statuses for a project |
-| `jira_get_sprints` | List sprints for a board (with sprint IDs for assignment) |
-| `jira_get_issue` | Get issue details by key |
-| `jira_issue_overview` | Get one-call issue overview (details, transitions, sprint context, optional comments) |
-| `jira_board_overview` | Get one-call board overview (board info, sprints, optional sprint issues) |
-| `jira_create_issue` | Create a new issue |
-| `jira_update_issue` | Update summary, description, assignee, or priority |
-| `jira_add_issues_to_sprint` | Add one or more issues to a sprint by sprint ID |
-| `jira_mutate_issue` | Bundle create/update/sprint/transition/comment actions into one call |
-| `jira_search_users` | Search for users by name or email |
-| `jira_get_comments` | List comments on an issue |
-| `jira_add_comment` | Add a comment to an issue |
-| `jira_transition_issue` | Move issue status via transition name or transition ID |
+| `git_get_context` | Branch, upstream state, remote URL, recent commits, working tree status, diff stat, and Jira keys in branch name |
+| `git_get_diff` | Diff of uncommitted changes or between two refs; supports paging via `charOffset` |
 
-### Bitbucket
+### Jira
 
 | Tool | Description |
 |---|---|
-| `bitbucket_list_repos` | List repositories (optionally by project) |
-| `bitbucket_list_pull_requests` | List repository pull requests (filter by state, source branch, or text) |
-| `bitbucket_my_prs` | List PRs in your inbox (authored by you or awaiting review) |
-| `bitbucket_get_pull_request` | Get pull request details |
-| `bitbucket_get_pr_overview` | Get a one-call PR overview: metadata, commits, comments, task-style BLOCKER comments, and optional diff |
-| `bitbucket_get_pr_diff` | Get the code diff for a pull request |
-| `bitbucket_create_pull_request` | Create a new pull request (checks for an existing open PR from the source branch first) |
-| `bitbucket_update_pull_request` | Update pull request title, description, destination branch, or reviewers |
-| `bitbucket_mutate_pull_request` | Create or update a pull request in one call (target by PR ID or source branch) |
-| `bitbucket_approve_pr` | Approve a pull request |
-| `bitbucket_unapprove_pr` | Remove your approval from a pull request |
-| `bitbucket_merge_pr` | Merge a pull request |
-| `bitbucket_decline_pr` | Decline a pull request |
-| `bitbucket_get_pr_comments` | Get PR comment threads in bulk, including task-style BLOCKER comments and blocker counts |
-| `bitbucket_add_pr_comment` | Add a PR comment; when remarking on an existing comment, pass `commentId` so it is posted as a thread reply |
-| `bitbucket_update_pr_comment` | Update comment text/severity (own comments only), resolve or reopen normal threads via `threadResolved`, and resolve/reopen BLOCKER tasks via `state` |
-| `bitbucket_delete_pr_comment` | Delete a PR comment by comment ID |
-| `bitbucket_get_pr_commits` | List commits included in a pull request |
-| `bitbucket_get_branches` | List branches in a repository |
-| `bitbucket_get_file` | Get raw file content at a given ref |
+| `jira_search` | Discover resources: `issues`, `projects`, `issue_types`, `boards`, `sprints`, `board_overview`, or `users` via `resource` param |
+| `jira_get` | Full details for one issue: summary, description, status, sprint, transitions, and comments |
+| `jira_mutate` | Create, update, transition, comment, link, add to sprint, or log work — all in one call |
+| `jira_comment` | Add, update, or delete a comment on an issue (`action`: `add` / `update` / `delete`) |
 
-### Git
+### Bitbucket
 
 | Tool | Description |
 |---|---|
-| `git_get_context` | Branch, remote, recent commits, working tree status, and any Jira keys detected in the branch name |
-| `git_get_commits` | Commit history for a branch with author and message |
-| `git_get_diff` | Diff of uncommitted changes or between two refs |
-
-All list tools support `limit` and `start`/`startAt` for pagination.
+| `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_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` |
 
 ### Natural language examples
 
-- "show my PRs waiting for review" → `bitbucket_my_prs`
-- "list open PRs for this repo from branch feature/ABC-123" → `bitbucket_list_pull_requests`
-- "open a PR from my current branch to master" → `bitbucket_create_pull_request`
-- "update PR 42 title and reviewers" → `bitbucket_update_pull_request`
-- "create or update PR from this branch in one call" → `bitbucket_mutate_pull_request`
-- "show review comments on PR 42" → `bitbucket_get_pr_comments`
-- "reply to comment 123 on PR 42" → `bitbucket_add_pr_comment` with `commentId=123`
-- "give me one full overview of PR 42" → `bitbucket_get_pr_overview`
-- "how many open blockers are on PR 42" → `bitbucket_get_pr_comments` with `severity=BLOCKER` and `countOnly=true`
-- "resolve this review thread on PR 42" → `bitbucket_update_pr_comment` with `threadResolved=true`
-- "resolve this blocker task on PR 42" → `bitbucket_update_pr_comment` with `severity=BLOCKER` and `state=RESOLVED`
-- "move FOO-123 to In Progress" → `jira_transition_issue` with `transitionName="In Progress"`
-- "find bugs assigned to me in PAY project" → `jira_search_issues`
-- "give me my coding context for this branch" → `get_dev_context`
+- "what am I working on?" → `get_dev_context`
+- "make a branch for FOO-123" → `start_work`
+- "ship this / merge and close the ticket" → `complete_work`
+- "show my PRs waiting for review" → `bitbucket_search` with `mine=true`
+- "list open PRs for this repo from feature/ABC-123" → `bitbucket_search` with `fromBranch`
+- "give me a full overview of PR 42" → `bitbucket_get_pr`
+- "open a PR from my current branch to master" → `bitbucket_mutate` with `create`
+- "approve / merge / decline PR 42" → `bitbucket_mutate` with `action`
+- "reply to comment 123 on PR 42" → `bitbucket_comment` with `commentId=123`
+- "resolve this blocker on PR 42" → `bitbucket_comment` with `action=update`, `severity=BLOCKER`, `state=RESOLVED`
+- "list PR checklist tasks" → `bitbucket_pr_tasks` with `action=list`
+- "find bugs assigned to me in PAY project" → `jira_search` with `mine=true`, `issueType=Bug`
+- "what's in the current sprint?" → `jira_search` with `resource=board_overview`
+- "move FOO-123 to In Progress" → `jira_mutate` with `transitionName="In Progress"`
+- "log 2h on FOO-123" → `jira_mutate` with `worklog`
 
 ---
 

package/dist/bitbucket.js

@@ -321,6 +321,19 @@ export class BitbucketClient {
             start = data.nextPageStart;
         }
     }
+    // Fallback: search branches matching filterText and check each for an open PR.
+    // Used when exact branch name lookup yields no result (e.g. LLM provides a partial branch name).
+    async findOpenPrByBranchFilter(projectKey, repoSlug, filterText) {
+        const branches = await this.request('GET', `/projects/${projectKey}/repos/${repoSlug}/branches?limit=25&filterText=${encodeURIComponent(filterText)}`);
+        if (!branches?.values?.length)
+            return null;
+        for (const b of branches.values) {
+            const pr = await this.findOpenPrForBranch(projectKey, repoSlug, b.displayId);
+            if (pr)
+                return pr;
+        }
+        return null;
+    }
     async listRepos(args) {
         const { limit = 50, start = 0 } = args;
         const qs = `?limit=${limit}&start=${start}`;
@@ -396,7 +409,11 @@ export class BitbucketClient {
             if (!branch || branch === 'HEAD') {
                 throw new Error('Provide prId or fromBranch, or run from a checked-out branch.');
             }
-            const found = await this.findOpenPrForBranch(projectKey, repoSlug, branch);
+            let found = await this.findOpenPrForBranch(projectKey, repoSlug, branch);
+            if (!found) {
+                // Fallback: search branches matching the input text, then check those for open PRs
+                found = await this.findOpenPrByBranchFilter(projectKey, repoSlug, branchDisplayId(branch));
+            }
             if (!found)
                 throw new Error(`No open PR found for branch "${branchDisplayId(branch)}".`);
             prId = found.id;
@@ -441,7 +458,8 @@ export class BitbucketClient {
             if (statuses?.values?.length) {
                 const statusLines = statuses.values.map((s) => {
                     const icon = s.state === 'SUCCESSFUL' ? '✓' : s.state === 'FAILED' ? '✗' : '…';
-                    return `${icon} [${s.state}] ${s.name ?? s.key}${s.description ? ` — ${s.description}` : ''}`;
+                    const urlPart = s.url ? `\n   URL: ${s.url}` : '';
+                    return `${icon} [${s.state}] ${s.name ?? s.key}${s.description ? ` — ${s.description}` : ''}${urlPart}`;
                 });
                 sections.push(`Build status (${pr.fromRef.latestCommit.slice(0, 8)}):\n${statusLines.join('\n')}`);
             }
@@ -1010,6 +1028,41 @@ export class BitbucketClient {
             return text(`Task #${args.taskId} ${newState}.`);
         return text(`Task #${updated.id} is now ${updated.state}: "${updated.text}"`);
     }
+    async getBuildLog(args) {
+        const { url, maxLines = 150 } = args;
+        const baseUrl = url.replace(/\/+$/, '');
+        // Confirm the URL is Jenkins before doing anything else
+        let probe;
+        try {
+            probe = await fetch(baseUrl, { method: 'HEAD' });
+        }
+        catch (e) {
+            return text(`Network error reaching ${baseUrl}: ${e}`);
+        }
+        const jenkinsVersion = probe.headers.get('X-Jenkins');
+        const fetchUrl = jenkinsVersion ? `${baseUrl}/consoleText` : baseUrl;
+        const label = jenkinsVersion ? `Jenkins ${jenkinsVersion}` : 'CI';
+        let res;
+        try {
+            res = await fetch(fetchUrl);
+        }
+        catch (e) {
+            return text(`Network error fetching build log from ${fetchUrl}: ${e}`);
+        }
+        if (res.status === 401 || res.status === 403) {
+            return text(`${label} returned HTTP ${res.status} for ${fetchUrl}.\n` +
+                `The build log requires authentication. View it directly in your browser.`);
+        }
+        if (!res.ok) {
+            return text(`Failed to fetch build log (HTTP ${res.status}) from ${fetchUrl}.`);
+        }
+        const raw = await res.text();
+        const lines = raw.split('\n');
+        const truncated = lines.length > maxLines;
+        const shown = truncated ? lines.slice(-maxLines) : lines;
+        const prefix = truncated ? `(showing last ${maxLines} of ${lines.length} lines)\n\n` : '';
+        return text(`Build log from ${label} — ${fetchUrl}:\n${prefix}${shown.join('\n')}`);
+    }
     async getBuildStatuses(args) {
         const data = await this.requestBuildStatus('GET', `/commits/${args.commitSha}`);
         if (!data?.values?.length)

package/dist/index.js

@@ -405,6 +405,18 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
                     },
                     required: ['prId'],
                 },
+            },
+            {
+                name: 'bitbucket_get_build_log',
+                description: 'Fetch CI build console output. Jenkins is detected via the X-Jenkins response header. Use after seeing a failed build URL in bitbucket_get_pr output — pass the URL exactly as shown. Returns the last N lines of the log (default 150).',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        url: { type: 'string', description: 'Build URL from CI status, e.g. https://jenkins.example.com/job/my-job/123/' },
+                        maxLines: { type: 'number', description: 'Max lines to return from the end of the log (default 150)', default: 150 },
+                    },
+                    required: ['url'],
+                },
             }] : []),
         // ── Combined workflow ─────────────────────────────────────────────────
         ...(jira && bitbucket ? [{
@@ -646,6 +658,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     return await bitbucket.getPrTasks(a);
                 return await bitbucket.mutatePrTask({ ...a, action: action });
             }
+            case 'bitbucket_get_build_log':
+                if (!bitbucket)
+                    throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${name}`);
+                return await bitbucket.getBuildLog(args);
             case 'complete_work': {
                 if (!jira || !bitbucket)
                     throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${name}`);

package/package.json

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