@falldownthesystem/devtool 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@falldownthesystem/devtool",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"description": "CLI for Bitbucket PRs, Jira tickets, Confluence pages, and Service Desk tickets",
 	"type": "module",
 	"bin": {

package/src/clients/serviceDesk.js

@@ -10,7 +10,7 @@ function authHeader() {
 	return 'Basic ' + Buffer.from(`${email}:${token}`).toString('base64');
 }
 
-async function request(path, params = {}) {
+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);
@@ -20,6 +20,7 @@ async function request(path, params = {}) {
 		headers: {
 			'Authorization': authHeader(),
 			'Accept': 'application/json',
+			...extraHeaders,
 		},
 	});
 
@@ -70,3 +71,49 @@ export async function getMyIssues() {
 		: `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

@@ -4,11 +4,14 @@ import {
 	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';
@@ -74,6 +77,43 @@ sd.command('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')

package/src/formatters/serviceDesk.js

@@ -59,6 +59,10 @@ function requestType(fields) {
 	return null;
 }
 
+function migrationServerKey(fields) {
+	return fields.customfield_10165 || null;
+}
+
 // --- JSON curators ---
 
 export function curateIssueJson(issue) {
@@ -70,6 +74,7 @@ export function curateIssueJson(issue) {
 		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 || [],
@@ -92,6 +97,7 @@ 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,
@@ -103,6 +109,31 @@ export function curateSearchJson(result) {
 	};
 }
 
+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) {
@@ -113,6 +144,8 @@ export function plainIssueView(issue) {
 	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(', ')}`);
@@ -131,6 +164,10 @@ export function plainIssueComments(comments) {
 }
 
 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;
@@ -153,6 +190,8 @@ export function formatIssueView(issue) {
 	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);
@@ -197,6 +236,12 @@ export function formatIssueComments(comments) {
 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;

package/src/index.js

@@ -13,7 +13,7 @@ const program = new Command();
 program
 	.name('dev')
 	.description('CLI for Bitbucket PRs, Jira tickets, Confluence pages, and Service Desk tickets')
-	.version('0.3.0')
+	.version('0.4.0')
 	.option('--json', 'Output raw JSON')
 	.option('--plain', 'Output compact plain text (no tables, no colors)');