@aaronsb/jira-cloud-mcp 0.2.7 → 0.3.1

package/build/client/jira-client.js

@@ -4,6 +4,10 @@ export class JiraClient {
     client;
     agileClient;
     customFields;
+    /** Expose the underlying Version3Client for field discovery and other direct API access */
+    get v3Client() {
+        return this.client;
+    }
     constructor(config) {
         const clientConfig = {
             host: config.host,
@@ -22,8 +26,47 @@ export class JiraClient {
             storyPoints: config.customFields?.storyPoints ?? 'customfield_10016',
         };
     }
-    async getIssue(issueKey, includeComments = false, includeAttachments = false) {
-        const fields = [
+    /** Standard Jira fields that require ADF format in v3 API */
+    static ADF_FIELDS = new Set(['environment']);
+    /** Convert any ADF-type fields in customFields from markdown to ADF */
+    convertAdfFields(customFields) {
+        const result = {};
+        for (const [key, value] of Object.entries(customFields)) {
+            if (JiraClient.ADF_FIELDS.has(key) && typeof value === 'string') {
+                result[key] = TextProcessor.markdownToAdf(value);
+            }
+            else {
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+    /** Format a custom field value for display */
+    formatCustomFieldValue(value) {
+        if (value === null || value === undefined)
+            return null;
+        // Jira option fields return { value: "..." } or { name: "..." }
+        if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+            const obj = value;
+            if ('value' in obj)
+                return obj.value;
+            if ('name' in obj)
+                return obj.name;
+            if ('displayName' in obj)
+                return obj.displayName;
+            // ADF content — extract text
+            if ('content' in obj && obj.type === 'doc')
+                return TextProcessor.extractTextFromAdf(obj);
+        }
+        // Array of options
+        if (Array.isArray(value)) {
+            return value.map(item => this.formatCustomFieldValue(item));
+        }
+        return value;
+    }
+    /** Shared field list for issue queries */
+    get issueFields() {
+        return [
             'summary',
             'description',
             'parent',
@@ -37,34 +80,69 @@ export class JiraClient {
             'timeestimate',
             'issuelinks',
         ];
+    }
+    /** Maps a raw Jira API issue to our JiraIssueDetails shape */
+    mapIssueFields(issue) {
+        const fields = issue.fields ?? issue.fields;
+        return {
+            key: issue.key,
+            summary: fields?.summary,
+            description: issue.renderedFields?.description || '',
+            parent: fields?.parent?.key || null,
+            assignee: fields?.assignee?.displayName || null,
+            reporter: fields?.reporter?.displayName || '',
+            status: fields?.status?.name || '',
+            resolution: fields?.resolution?.name || null,
+            dueDate: fields?.duedate || null,
+            startDate: fields?.[this.customFields.startDate] || null,
+            storyPoints: fields?.[this.customFields.storyPoints] || null,
+            timeEstimate: fields?.timeestimate || null,
+            issueLinks: (fields?.issuelinks || []).map((link) => ({
+                type: link.type?.name || '',
+                outward: link.outwardIssue?.key || null,
+                inward: link.inwardIssue?.key || null,
+            })),
+        };
+    }
+    async getIssue(issueKey, includeComments = false, includeAttachments = false, customFieldMeta) {
+        const fields = [...this.issueFields];
         if (includeAttachments) {
             fields.push('attachment');
         }
+        // Include discovered custom field IDs in the fetch
+        if (customFieldMeta) {
+            for (const cf of customFieldMeta) {
+                if (!fields.includes(cf.id)) {
+                    fields.push(cf.id);
+                }
+            }
+        }
         const params = {
             issueIdOrKey: issueKey,
             fields,
             expand: includeComments ? 'renderedFields,comments' : 'renderedFields'
         };
         const issue = await this.client.issues.getIssue(params);
-        const issueDetails = {
-            key: issue.key,
-            summary: issue.fields.summary,
-            description: issue.renderedFields?.description || '',
-            parent: issue.fields.parent?.key || null,
-            assignee: issue.fields.assignee?.displayName || null,
-            reporter: issue.fields.reporter?.displayName || '',
-            status: issue.fields.status?.name || '',
-            resolution: issue.fields.resolution?.name || null,
-            dueDate: issue.fields.duedate || null,
-            startDate: issue.fields[this.customFields.startDate] || null,
-            storyPoints: issue.fields[this.customFields.storyPoints] || null,
-            timeEstimate: issue.fields.timeestimate || null,
-            issueLinks: (issue.fields.issuelinks || []).map(link => ({
-                type: link.type?.name || '',
-                outward: link.outwardIssue?.key || null,
-                inward: link.inwardIssue?.key || null,
-            })),
-        };
+        const issueDetails = this.mapIssueFields(issue);
+        // Extract custom field values using catalog metadata
+        if (customFieldMeta) {
+            const rawFields = issue.fields;
+            const customValues = [];
+            for (const cf of customFieldMeta) {
+                const value = rawFields[cf.id];
+                if (value !== undefined && value !== null) {
+                    customValues.push({
+                        name: cf.name,
+                        value: this.formatCustomFieldValue(value),
+                        type: cf.type,
+                        description: cf.description,
+                    });
+                }
+            }
+            if (customValues.length > 0) {
+                issueDetails.customFieldValues = customValues;
+            }
+        }
         if (includeComments && issue.fields.comment?.comments) {
             issueDetails.comments = issue.fields.comment.comments
                 .filter(comment => comment.id &&
@@ -130,40 +208,10 @@ export class JiraClient {
         }
         const searchResults = await this.client.issueSearch.searchForIssuesUsingJql({
             jql: filter.jql,
-            fields: [
-                'summary',
-                'description',
-                'assignee',
-                'reporter',
-                'status',
-                'resolution',
-                'duedate',
-                this.customFields.startDate,
-                this.customFields.storyPoints,
-                'timeestimate',
-                'issuelinks',
-            ],
+            fields: this.issueFields,
             expand: 'renderedFields'
         });
-        return (searchResults.issues || []).map(issue => ({
-            key: issue.key,
-            summary: issue.fields.summary,
-            description: issue.renderedFields?.description || '',
-            parent: issue.fields.parent?.key || null,
-            assignee: issue.fields.assignee?.displayName || null,
-            reporter: issue.fields.reporter?.displayName || '',
-            status: issue.fields.status?.name || '',
-            resolution: issue.fields.resolution?.name || null,
-            dueDate: issue.fields.duedate || null,
-            startDate: issue.fields[this.customFields.startDate] || null,
-            storyPoints: issue.fields[this.customFields.storyPoints] || null,
-            timeEstimate: issue.fields.timeestimate || null,
-            issueLinks: (issue.fields.issuelinks || []).map(link => ({
-                type: link.type?.name || '',
-                outward: link.outwardIssue?.key || null,
-                inward: link.inwardIssue?.key || null,
-            })),
-        }));
+        return (searchResults.issues || []).map(issue => this.mapIssueFields(issue));
     }
     async updateIssue(params) {
         const fields = {};
@@ -184,7 +232,7 @@ export class JiraClient {
         if (params.labels)
             fields.labels = params.labels;
         if (params.customFields) {
-            Object.assign(fields, params.customFields);
+            Object.assign(fields, this.convertAdfFields(params.customFields));
         }
         await this.client.issues.editIssue({
             issueIdOrKey: params.issueKey,
@@ -206,41 +254,10 @@ export class JiraClient {
             const searchResults = await this.client.issueSearch.searchForIssuesUsingJqlEnhancedSearch({
                 jql: cleanJql,
                 maxResults: Math.min(maxResults, 100),
-                fields: [
-                    'summary',
-                    'description',
-                    'assignee',
-                    'reporter',
-                    'status',
-                    'resolution',
-                    'duedate',
-                    'parent',
-                    this.customFields.startDate,
-                    this.customFields.storyPoints,
-                    'timeestimate',
-                    'issuelinks',
-                ],
+                fields: this.issueFields,
                 expand: 'renderedFields',
             });
-            const issues = (searchResults.issues || []).map(issue => ({
-                key: issue.key,
-                summary: issue.fields?.summary,
-                description: issue.renderedFields?.description || '',
-                parent: issue.fields?.parent?.key || null,
-                assignee: issue.fields?.assignee?.displayName || null,
-                reporter: issue.fields?.reporter?.displayName || '',
-                status: issue.fields?.status?.name || '',
-                resolution: issue.fields?.resolution?.name || null,
-                dueDate: issue.fields?.duedate || null,
-                startDate: issue.fields?.[this.customFields.startDate] || null,
-                storyPoints: issue.fields?.[this.customFields.storyPoints] || null,
-                timeEstimate: issue.fields?.timeestimate || null,
-                issueLinks: (issue.fields?.issuelinks || []).map(link => ({
-                    type: link.type?.name || '',
-                    outward: link.outwardIssue?.key || null,
-                    inward: link.inwardIssue?.key || null,
-                })),
-            }));
+            const issues = (searchResults.issues || []).map(issue => this.mapIssueFields(issue));
             // Note: Enhanced search API uses token-based pagination, not offset-based
             // The total count is not available in the new API
             const hasMore = !!searchResults.nextPageToken;
@@ -684,6 +701,20 @@ export class JiraClient {
             url: project.self || ''
         }));
     }
+    async deleteIssue(issueKey) {
+        console.error(`Deleting issue ${issueKey}...`);
+        await this.client.issues.deleteIssue({ issueIdOrKey: issueKey });
+    }
+    async moveIssue(issueKey, targetProjectKey, targetIssueType) {
+        console.error(`Moving issue ${issueKey} to ${targetProjectKey} as ${targetIssueType}...`);
+        await this.client.issues.editIssue({
+            issueIdOrKey: issueKey,
+            fields: {
+                project: { key: targetProjectKey },
+                issuetype: { name: targetIssueType },
+            },
+        });
+    }
     async createIssue(params) {
         const fields = {
             project: { key: params.projectKey },
@@ -700,7 +731,7 @@ export class JiraClient {
         if (params.labels)
             fields.labels = params.labels;
         if (params.customFields) {
-            Object.assign(fields, params.customFields);
+            Object.assign(fields, this.convertAdfFields(params.customFields));
         }
         const response = await this.client.issues.createIssue({ fields });
         return { key: response.key };