@falldownthesystem/devtool 0.2.0 → 0.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@falldownthesystem/devtool",
-	"version": "0.2.0",
-	"description": "CLI for Bitbucket PRs, Jira tickets, and Confluence pages",
+	"version": "0.4.0",
+	"description": "CLI for Bitbucket PRs, Jira tickets, Confluence pages, and Service Desk tickets",
 	"type": "module",
 	"bin": {
 		"dev": "src/index.js"

package/src/clients/serviceDesk.js

@@ -0,0 +1,119 @@
+import { get } from '../config/store.js';
+
+function baseUrl() {
+	return get('serviceDesk.baseUrl');
+}
+
+function authHeader() {
+	const email = get('serviceDesk.email');
+	const token = get('serviceDesk.token');
+	return 'Basic ' + Buffer.from(`${email}:${token}`).toString('base64');
+}
+
+async function request(path, params = {}, extraHeaders = {}) {
+	const url = new URL(path.startsWith('http') ? path : `${baseUrl()}${path}`);
+	for (const [k, v] of Object.entries(params)) {
+		if (v !== undefined && v !== null && v !== '') url.searchParams.set(k, v);
+	}
+
+	const res = await fetch(url, {
+		headers: {
+			'Authorization': authHeader(),
+			'Accept': 'application/json',
+			...extraHeaders,
+		},
+	});
+
+	if (!res.ok) {
+		const err = new Error(`Service Desk API error: ${res.status} ${res.statusText}`);
+		err.status = res.status;
+		err.url = url.toString();
+		throw err;
+	}
+
+	return res.json();
+}
+
+export async function getIssue(issueKey) {
+	return request(`/rest/api/3/issue/${encodeURIComponent(issueKey)}`, {
+		expand: 'renderedFields',
+	});
+}
+
+export async function getIssueComments(issueKey) {
+	const data = await request(`/rest/api/3/issue/${encodeURIComponent(issueKey)}/comment`, {
+		orderBy: 'created',
+		maxResults: 100,
+	});
+	return data.comments || [];
+}
+
+export async function searchIssues(jql, maxResults = 50, nextPageToken = '') {
+	const fields = 'summary,status,assignee,priority,updated,issuetype,reporter,customfield_10010';
+	const data = await request('/rest/api/3/search/jql', {
+		jql,
+		fields,
+		maxResults,
+		nextPageToken,
+	});
+	return {
+		issues: data.issues || [],
+		nextPageToken: data.nextPageToken || null,
+		isLast: data.isLast !== false,
+		maxResults,
+	};
+}
+
+export async function getMyIssues() {
+	const project = get('serviceDesk.defaultProject');
+	const jql = project
+		? `project = ${project} AND assignee = currentUser() AND statusCategory != Done ORDER BY updated DESC`
+		: `assignee = currentUser() AND statusCategory != Done ORDER BY updated DESC`;
+	return searchIssues(jql);
+}
+
+let _serviceDeskIdCache = null;
+
+async function getServiceDeskId(projectKey) {
+	if (_serviceDeskIdCache && _serviceDeskIdCache.projectKey === projectKey) {
+		return _serviceDeskIdCache.id;
+	}
+	const data = await request('/rest/servicedeskapi/servicedesk', { start: 0, limit: 100 }, { 'X-ExperimentalApi': 'opt-in' });
+	const match = (data.values || []).find((sd) => sd.projectKey === projectKey);
+	if (!match) {
+		throw new Error(`No Service Desk found for project ${projectKey}`);
+	}
+	_serviceDeskIdCache = { projectKey, id: match.id };
+	return match.id;
+}
+
+export async function listQueues() {
+	const projectKey = get('serviceDesk.defaultProject');
+	if (!projectKey) throw new Error('serviceDesk.defaultProject is not configured');
+	const sdId = await getServiceDeskId(projectKey);
+	const data = await request(`/rest/servicedeskapi/servicedesk/${sdId}/queue`, { start: 0, limit: 100 }, { 'X-ExperimentalApi': 'opt-in' });
+	return (data.values || []).map((q) => ({ id: q.id, name: q.name, jql: q.jql }));
+}
+
+export async function findQueue(nameOrId) {
+	const queues = await listQueues();
+	const idMatch = queues.find((q) => String(q.id) === String(nameOrId));
+	if (idMatch) return idMatch;
+	const lower = nameOrId.toLowerCase();
+	const exact = queues.find((q) => q.name.toLowerCase() === lower);
+	if (exact) return exact;
+	const partial = queues.filter((q) => q.name.toLowerCase().includes(lower));
+	if (partial.length === 1) return partial[0];
+	if (partial.length > 1) {
+		const err = new Error(`Ambiguous queue "${nameOrId}" — matches: ${partial.map((q) => q.name).join(', ')}`);
+		err.candidates = partial;
+		throw err;
+	}
+	throw new Error(`No queue found matching "${nameOrId}"`);
+}
+
+export async function searchByQueue(nameOrId, maxResults = 50, nextPageToken = '') {
+	const queue = await findQueue(nameOrId);
+	const result = await searchIssues(queue.jql, maxResults, nextPageToken);
+	return { ...result, queue };
+}

package/src/commands/sd.js

@@ -0,0 +1,135 @@
+import { Command } from 'commander';
+import {
+	getIssue,
+	getIssueComments,
+	searchIssues,
+	getMyIssues,
+	listQueues,
+	searchByQueue,
+} from '../clients/serviceDesk.js';
+import {
+	formatIssueView, formatIssueComments, formatIssueSearch,
+	plainIssueView, plainIssueComments, plainIssueSearch,
+	curateIssueJson, curateCommentsJson, curateSearchJson,
+	formatQueueList, plainQueueList, curateQueuesJson,
+} from '../formatters/serviceDesk.js';
+import { spinner } from '../utils/output.js';
+import { handleError } from '../utils/errors.js';
+import { getOutputMode, outputJson } from '../utils/mode.js';
+
+const sd = new Command('sd')
+	.alias('servicedesk')
+	.description('Jira Service Desk Cloud tickets');
+
+sd.command('view <key>')
+	.alias('read')
+	.description('View ticket details')
+	.action(async function (key) {
+		const mode = getOutputMode(this);
+		const s = mode === 'rich' ? spinner(`Fetching ${key}...`).start() : null;
+		try {
+			const issue = await getIssue(key);
+			if (s) s.success({ text: key });
+			if (mode === 'json') outputJson(curateIssueJson(issue));
+			else if (mode === 'plain') plainIssueView(issue);
+			else formatIssueView(issue);
+		} catch (err) {
+			if (s) s.error({ text: `Failed to fetch ${key}` });
+			handleError(err, `sd view ${key}`);
+		}
+	});
+
+sd.command('comments <key>')
+	.description('List ticket comments')
+	.action(async function (key) {
+		const mode = getOutputMode(this);
+		const s = mode === 'rich' ? spinner(`Fetching comments for ${key}...`).start() : null;
+		try {
+			const comments = await getIssueComments(key);
+			if (s) s.success({ text: `${comments.length} comment(s)` });
+			if (mode === 'json') outputJson(curateCommentsJson(comments));
+			else if (mode === 'plain') plainIssueComments(comments);
+			else formatIssueComments(comments);
+		} catch (err) {
+			if (s) s.error({ text: `Failed to fetch comments for ${key}` });
+			handleError(err, `sd comments ${key}`);
+		}
+	});
+
+sd.command('search <jql>')
+	.alias('find')
+	.description('Search Service Desk tickets with JQL')
+	.option('-n, --per-page <number>', 'Results per page', '20')
+	.option('--next <token>', 'Continuation token from a previous page')
+	.action(async function (jql, opts) {
+		const mode = getOutputMode(this);
+		const perPage = parseInt(opts.perPage, 10);
+		const s = mode === 'rich' ? spinner('Searching...').start() : null;
+		try {
+			const result = await searchIssues(jql, perPage, opts.next || '');
+			if (s) s.success({ text: `${result.issues.length} issue(s) returned` });
+			if (mode === 'json') outputJson(curateSearchJson(result));
+			else if (mode === 'plain') plainIssueSearch(result);
+			else formatIssueSearch(result);
+		} catch (err) {
+			if (s) s.error({ text: 'Search failed' });
+			handleError(err, `sd search "${jql}"`);
+		}
+	});
+
+sd.command('queues')
+	.description('List Service Desk queues for the default project')
+	.action(async function () {
+		const mode = getOutputMode(this);
+		const s = mode === 'rich' ? spinner('Fetching queues...').start() : null;
+		try {
+			const queues = await listQueues();
+			if (s) s.success({ text: `${queues.length} queue(s)` });
+			if (mode === 'json') outputJson(curateQueuesJson(queues));
+			else if (mode === 'plain') plainQueueList(queues);
+			else formatQueueList(queues);
+		} catch (err) {
+			if (s) s.error({ text: 'Failed to fetch queues' });
+			handleError(err, 'sd queues');
+		}
+	});
+
+sd.command('queue <nameOrId>')
+	.description('Show issues in a Service Desk queue (by name or id)')
+	.option('-n, --per-page <number>', 'Results per page', '20')
+	.option('--next <token>', 'Continuation token from a previous page')
+	.action(async function (nameOrId, opts) {
+		const mode = getOutputMode(this);
+		const perPage = parseInt(opts.perPage, 10);
+		const s = mode === 'rich' ? spinner(`Fetching queue "${nameOrId}"...`).start() : null;
+		try {
+			const result = await searchByQueue(nameOrId, perPage, opts.next || '');
+			if (s) s.success({ text: `${result.issues.length} issue(s) in "${result.queue.name}"` });
+			if (mode === 'json') outputJson(curateSearchJson(result));
+			else if (mode === 'plain') plainIssueSearch(result);
+			else formatIssueSearch(result);
+		} catch (err) {
+			if (s) s.error({ text: `Failed to fetch queue "${nameOrId}"` });
+			handleError(err, `sd queue ${nameOrId}`);
+		}
+	});
+
+sd.command('mine')
+	.alias('my')
+	.description('Show my open Service Desk tickets')
+	.action(async function () {
+		const mode = getOutputMode(this);
+		const s = mode === 'rich' ? spinner('Fetching my tickets...').start() : null;
+		try {
+			const result = await getMyIssues();
+			if (s) s.success({ text: `${result.issues.length} ticket(s)` });
+			if (mode === 'json') outputJson(curateSearchJson(result));
+			else if (mode === 'plain') plainIssueSearch(result);
+			else formatIssueSearch(result);
+		} catch (err) {
+			if (s) s.error({ text: 'Failed to fetch tickets' });
+			handleError(err, 'sd my tickets');
+		}
+	});
+
+export default sd;

package/src/config/store.js

@@ -29,6 +29,15 @@ const schema = {
 			defaultSpace: { type: 'string' },
 		},
 	},
+	serviceDesk: {
+		type: 'object',
+		properties: {
+			baseUrl: { type: 'string' },
+			email: { type: 'string' },
+			token: { type: 'string' },
+			defaultProject: { type: 'string' },
+		},
+	},
 };
 
 const config = new Conf({
@@ -38,6 +47,7 @@ const config = new Conf({
 		bitbucket: { workspace: '', defaultRepo: '', email: '', token: '' },
 		jira: { baseUrl: '', token: '', defaultProject: '' },
 		confluence: { baseUrl: '', email: '', token: '', defaultSpace: '' },
+		serviceDesk: { baseUrl: '', email: '', token: '', defaultProject: '' },
 	},
 });
 
@@ -146,9 +156,52 @@ export async function runSetup() {
 		},
 	});
 
+	const reuseConfluenceCreds = confluence.email && confluence.token
+		? await p.confirm({
+			message: 'Reuse Confluence email/token for Jira Service Desk Cloud?',
+			initialValue: true,
+		})
+		: false;
+
+	if (p.isCancel(reuseConfluenceCreds)) {
+		p.cancel('Setup cancelled.');
+		process.exit(0);
+	}
+
+	const serviceDesk = await p.group({
+		baseUrl: () => p.text({
+			message: 'Jira Service Desk Cloud base URL (use canonical *.atlassian.net, not a vanity domain)',
+			placeholder: 'https://company.atlassian.net',
+			initialValue: config.get('serviceDesk.baseUrl') || '',
+		}),
+		email: () => reuseConfluenceCreds
+			? Promise.resolve(confluence.email)
+			: p.text({
+				message: 'Service Desk account email',
+				placeholder: 'you@company.com',
+				initialValue: config.get('serviceDesk.email') || '',
+			}),
+		token: () => reuseConfluenceCreds
+			? Promise.resolve(confluence.token)
+			: p.password({
+				message: 'Service Desk API token',
+			}),
+		defaultProject: () => p.text({
+			message: 'Service Desk default project key',
+			placeholder: 'TUKI',
+			initialValue: config.get('serviceDesk.defaultProject') || '',
+		}),
+	}, {
+		onCancel: () => {
+			p.cancel('Setup cancelled.');
+			process.exit(0);
+		},
+	});
+
 	config.set('bitbucket', bb);
 	config.set('jira', jira);
 	config.set('confluence', confluence);
+	config.set('serviceDesk', serviceDesk);
 
 	p.outro(pc.green('Configuration saved!'));
 }

package/src/formatters/serviceDesk.js

@@ -0,0 +1,267 @@
+import { table, heading, field, divider, pc } from '../utils/output.js';
+
+function statusColor(name) {
+	if (!name) return pc.dim('Unknown');
+	const lower = name.toLowerCase();
+	if (lower === 'done' || lower === 'closed' || lower === 'resolved') return pc.green(name);
+	if (lower === 'in progress' || lower === 'in review' || lower === 'waiting for support') return pc.blue(name);
+	if (lower === 'to do' || lower === 'open' || lower === 'backlog' || lower === 'waiting for customer') return pc.yellow(name);
+	return name;
+}
+
+function priorityColor(name) {
+	if (!name) return pc.dim('None');
+	const lower = name.toLowerCase();
+	if (lower === 'highest' || lower === 'blocker') return pc.red(pc.bold(name));
+	if (lower === 'high' || lower === 'critical') return pc.red(name);
+	if (lower === 'low' || lower === 'minor' || lower === 'lowest' || lower === 'trivial') return pc.dim(name);
+	return name;
+}
+
+function relativeTime(dateStr) {
+	if (!dateStr) return '';
+	const diff = Date.now() - new Date(dateStr).getTime();
+	const mins = Math.floor(diff / 60000);
+	if (mins < 60) return `${mins}m ago`;
+	const hours = Math.floor(mins / 60);
+	if (hours < 24) return `${hours}h ago`;
+	const days = Math.floor(hours / 24);
+	if (days < 30) return `${days}d ago`;
+	return new Date(dateStr).toLocaleDateString();
+}
+
+function adfToText(node) {
+	if (!node) return '';
+	if (typeof node === 'string') return node;
+	if (Array.isArray(node)) return node.map(adfToText).join('');
+	if (node.type === 'text') return node.text || '';
+	if (node.type === 'hardBreak') return '\n';
+	const inner = adfToText(node.content);
+	const blockTypes = new Set(['paragraph', 'heading', 'bulletList', 'orderedList', 'listItem', 'codeBlock', 'blockquote']);
+	if (blockTypes.has(node.type)) return inner + '\n';
+	return inner;
+}
+
+function descriptionText(field) {
+	if (!field) return '';
+	if (typeof field === 'string') return field;
+	return adfToText(field).trim();
+}
+
+function requestType(fields) {
+	for (const key of Object.keys(fields)) {
+		if (!key.startsWith('customfield_')) continue;
+		const val = fields[key];
+		if (val && typeof val === 'object' && val.requestType?.name) {
+			return val.requestType.name;
+		}
+	}
+	return null;
+}
+
+function migrationServerKey(fields) {
+	return fields.customfield_10165 || null;
+}
+
+// --- JSON curators ---
+
+export function curateIssueJson(issue) {
+	const f = issue.fields;
+	return {
+		key: issue.key,
+		summary: f.summary,
+		status: f.status?.name || null,
+		priority: f.priority?.name || null,
+		type: f.issuetype?.name || null,
+		requestType: requestType(f),
+		migrationServerKey: migrationServerKey(f),
+		assignee: f.assignee?.displayName || null,
+		reporter: f.reporter?.displayName || null,
+		labels: f.labels || [],
+		components: (f.components || []).map((c) => c.name),
+		created: f.created,
+		updated: f.updated,
+		description: descriptionText(f.description),
+	};
+}
+
+export function curateCommentsJson(comments) {
+	return comments.map((c) => ({
+		author: c.author?.displayName || null,
+		date: c.created,
+		body: descriptionText(c.body),
+	}));
+}
+
+export function curateSearchJson(result) {
+	return {
+		nextPageToken: result.nextPageToken,
+		isLast: result.isLast,
+		queue: result.queue ? { id: result.queue.id, name: result.queue.name, jql: result.queue.jql } : undefined,
+		issues: result.issues.map((issue) => ({
+			key: issue.key,
+			summary: issue.fields.summary,
+			status: issue.fields.status?.name || null,
+			assignee: issue.fields.assignee?.displayName || null,
+			priority: issue.fields.priority?.name || null,
+			updated: issue.fields.updated,
+		})),
+	};
+}
+
+export function curateQueuesJson(queues) {
+	return queues.map((q) => ({ id: q.id, name: q.name, jql: q.jql }));
+}
+
+export function plainQueueList(queues) {
+	if (queues.length === 0) { console.log('No queues.'); return; }
+	for (const q of queues) {
+		console.log(`${q.id}\t${q.name}\t${q.jql}`);
+	}
+}
+
+export function formatQueueList(queues) {
+	if (queues.length === 0) {
+		console.log(pc.dim('  No queues.'));
+		return;
+	}
+	const rows = queues.map((q) => [
+		pc.dim(String(q.id)),
+		pc.bold(q.name),
+		(q.jql || '').length > 80 ? q.jql.slice(0, 77) + '...' : q.jql || '',
+	]);
+	console.log(table(['ID', 'Name', 'JQL'], rows));
+	console.log('');
+}
+
+// --- Plain formatters ---
+
+export function plainIssueView(issue) {
+	const f = issue.fields;
+	console.log(`${issue.key} ${f.summary}`);
+	console.log(`Status: ${f.status?.name || 'Unknown'}`);
+	console.log(`Priority: ${f.priority?.name || 'None'}`);
+	console.log(`Type: ${f.issuetype?.name || 'Unknown'}`);
+	const rt = requestType(f);
+	if (rt) console.log(`Request Type: ${rt}`);
+	const mk = migrationServerKey(f);
+	if (mk) console.log(`Migration Server Key: ${mk}`);
+	console.log(`Assignee: ${f.assignee?.displayName || 'Unassigned'}`);
+	console.log(`Reporter: ${f.reporter?.displayName || 'Unknown'}`);
+	if (f.labels?.length > 0) console.log(`Labels: ${f.labels.join(', ')}`);
+	if (f.components?.length > 0) console.log(`Components: ${f.components.map((c) => c.name).join(', ')}`);
+	console.log(`Created: ${f.created}`);
+	console.log(`Updated: ${f.updated}`);
+	const desc = descriptionText(f.description);
+	if (desc) console.log(`Description:\n${desc}`);
+}
+
+export function plainIssueComments(comments) {
+	if (comments.length === 0) { console.log('No comments.'); return; }
+	for (const c of comments) {
+		console.log(`${c.author?.displayName || 'Unknown'} (${relativeTime(c.created)}): ${descriptionText(c.body)}`);
+	}
+}
+
+export function plainIssueSearch(result) {
+	if (result.queue) {
+		console.log(`Queue: ${result.queue.name} (${result.queue.id})`);
+		console.log(`JQL: ${result.queue.jql}`);
+	}
+	if (result.issues.length === 0) { console.log('No issues found.'); return; }
+	for (const issue of result.issues) {
+		const f = issue.fields;
+		console.log(`${issue.key} [${f.status?.name}] "${f.summary}" - ${f.assignee?.displayName || 'Unassigned'} (${f.priority?.name}, ${relativeTime(f.updated)})`);
+	}
+	if (!result.isLast && result.nextPageToken) {
+		console.log(`More results available (nextPageToken: ${result.nextPageToken})`);
+	}
+}
+
+// --- Rich formatters ---
+
+export function formatIssueView(issue) {
+	const f = issue.fields;
+
+	heading(`${issue.key} ${f.summary}`);
+	divider();
+	field('Status', statusColor(f.status?.name));
+	field('Priority', priorityColor(f.priority?.name));
+	field('Type', f.issuetype?.name);
+	const rt = requestType(f);
+	if (rt) field('Request Type', rt);
+	const mk = migrationServerKey(f);
+	if (mk) field('Migration Server Key', mk);
+	field('Assignee', f.assignee?.displayName || pc.dim('Unassigned'));
+	field('Reporter', f.reporter?.displayName);
+	field('Labels', f.labels?.length > 0 ? f.labels.join(', ') : null);
+	field('Components', f.components?.map((c) => c.name).join(', ') || null);
+	field('Created', new Date(f.created).toLocaleString());
+	field('Updated', new Date(f.updated).toLocaleString());
+
+	const desc = descriptionText(f.description);
+	if (desc) {
+		heading('Description');
+		const lines = desc.split('\n');
+		const truncated = lines.slice(0, 30);
+		for (const line of truncated) {
+			console.log(`  ${line}`);
+		}
+		if (lines.length > 30) {
+			console.log(pc.dim(`  ... (${lines.length - 30} more lines)`));
+		}
+	}
+
+	console.log('');
+}
+
+export function formatIssueComments(comments) {
+	if (comments.length === 0) {
+		console.log(pc.dim('  No comments.'));
+		return;
+	}
+
+	for (const c of comments) {
+		console.log(`\n  ${pc.bold(c.author?.displayName || 'Unknown')} ${pc.dim(relativeTime(c.created))}`);
+		const body = descriptionText(c.body);
+		if (body) {
+			for (const line of body.split('\n')) {
+				console.log(`  ${line}`);
+			}
+		}
+	}
+	console.log('');
+}
+
+export function formatIssueSearch(result) {
+	const { issues } = result;
+
+	if (result.queue) {
+		heading(`Queue: ${result.queue.name}`);
+		console.log(pc.dim(`  ${result.queue.jql}`));
+		divider();
+	}
+
+	if (issues.length === 0) {
+		console.log(pc.dim('  No issues found.'));
+		return;
+	}
+
+	const rows = issues.map((issue) => [
+		pc.bold(issue.key),
+		(issue.fields.summary || '').length > 55
+			? issue.fields.summary.slice(0, 52) + '...'
+			: issue.fields.summary || '',
+		statusColor(issue.fields.status?.name),
+		issue.fields.assignee?.displayName || pc.dim('Unassigned'),
+		priorityColor(issue.fields.priority?.name),
+		relativeTime(issue.fields.updated),
+	]);
+
+	console.log(table(['Key', 'Summary', 'Status', 'Assignee', 'Priority', 'Updated'], rows));
+
+	if (!result.isLast && result.nextPageToken) {
+		console.log(pc.dim(`  More results available — pass --next ${result.nextPageToken} to continue`));
+	}
+	console.log('');
+}

package/src/index.js

@@ -6,13 +6,14 @@ import configCmd from './commands/config.js';
 import prCmd from './commands/pr.js';
 import jiraCmd from './commands/jira.js';
 import confluenceCmd from './commands/confluence.js';
+import sdCmd from './commands/sd.js';
 
 const program = new Command();
 
 program
 	.name('dev')
-	.description('CLI for Bitbucket PRs, Jira tickets, and Confluence pages')
-	.version('0.2.0')
+	.description('CLI for Bitbucket PRs, Jira tickets, Confluence pages, and Service Desk tickets')
+	.version('0.4.0')
 	.option('--json', 'Output raw JSON')
 	.option('--plain', 'Output compact plain text (no tables, no colors)');
 
@@ -20,6 +21,7 @@ program.addCommand(configCmd);
 program.addCommand(prCmd);
 program.addCommand(jiraCmd);
 program.addCommand(confluenceCmd);
+program.addCommand(sdCmd);
 
 program.hook('preAction', async (thisCommand, actionCommand) => {
 	const cmdChain = [];