atlass 1.0.0 → 1.1.0

package/README.md

@@ -72,6 +72,49 @@ atlass confluence copy     # prompts for the id or URL
 Accepts a numeric page id or a page URL. Writes `123456-title-slug.md` to the
 current directory.
 
+### Search Jira issues
+
+```bash
+atlass jira search "safari login"                 # free text
+atlass jira search --project PROJ --assignee me   # my open issues in PROJ
+atlass jira search --status "In Progress"
+atlass jira search --jql "project = PROJ AND labels = regression"
+atlass jira search                                # recent issues
+```
+
+Friendly filters (`--project`, `--assignee`, `--status`, text) are AND'd
+together and ordered by most recently updated. `--assignee me` maps to the
+current user. `--jql` takes a raw query and cannot be combined with the friendly
+filters. Prints one issue per line (`KEY  status  summary`); use `--json` for
+machine output. Only the first `--limit` results are shown (default 25, max
+100).
+
+### Search Confluence pages
+
+```bash
+atlass confluence search "onboarding"
+atlass confluence search --space DOCS
+atlass confluence search --cql "label = runbook ORDER BY created DESC"
+atlass confluence search                          # recent pages
+```
+
+Friendly mode always constrains to pages, so every result is copy-able. `--cql`
+takes a raw query and cannot be combined with `--space` or text. Prints one page
+per line (`id  space  title`); `--json` and `--limit` work as for Jira.
+
+### Copy from search results
+
+Add `--copy` to any search to pick results interactively and copy each to
+Markdown (multi-select, needs an interactive terminal). With `--copy`, `--out`
+is a directory that every selected file is written into:
+
+```bash
+atlass jira search --project PROJ --copy --out ./tickets/
+atlass confluence search --space DOCS --copy
+```
+
+Copying continues on failure and reports a summary at the end.
+
 ### Output location
 
 By default files are written to the current directory, named after the issue

package/dist/cli.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import { Command } from "commander";
-import { input, password } from "@inquirer/prompts";
+import { checkbox, input, password } from "@inquirer/prompts";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { Entry } from "@napi-rs/keyring";
 //#region package.json
-var version = "1.0.0";
+var version = "1.1.0";
 //#endregion
 //#region src/api/client.ts
 var AtlassianClient = class {
@@ -22,7 +22,10 @@ var AtlassianClient = class {
 			Authorization: this.authHeader,
 			Accept: accept
 		} });
-		if (!res.ok) throw httpError(res.status, path);
+		if (!res.ok) {
+			const body = await res.text().catch(() => "");
+			throw httpError(res.status, path, body);
+		}
 		return res;
 	}
 	async getJson(path) {
@@ -34,10 +37,24 @@ var AtlassianClient = class {
 		return new Uint8Array(await res.arrayBuffer());
 	}
 };
-function httpError(status, path) {
+function httpError(status, path, body = "") {
 	if (status === 401 || status === 403) return /* @__PURE__ */ new Error("Authentication failed (401/403). Run `atlass auth login` to update your token.");
 	if (status === 404) return /* @__PURE__ */ new Error(`Not found (404): ${path}`);
-	return /* @__PURE__ */ new Error(`Request failed (${status}): ${path}`);
+	if (status === 400) {
+		const detail = extractError(body);
+		return /* @__PURE__ */ new Error(`Bad request (400): ${detail || path}`);
+	}
+	const detail = extractError(body);
+	return /* @__PURE__ */ new Error(`Request failed (${status}): ${detail || path}`);
+}
+function extractError(body) {
+	if (!body) return "";
+	try {
+		const json = JSON.parse(body);
+		if (json.errorMessages?.length) return json.errorMessages.join("; ");
+		if (json.message) return json.message;
+	} catch {}
+	return body.slice(0, 300);
 }
 //#endregion
 //#region src/config.ts
@@ -357,6 +374,25 @@ function uniqueName(name, used) {
 	return candidate;
 }
 //#endregion
+//#region src/util/html.ts
+const NAMED = {
+	amp: "&",
+	lt: "<",
+	gt: ">",
+	quot: "\"",
+	apos: "'",
+	nbsp: " "
+};
+function decodeEntities(text) {
+	return text.replace(/&(#x?[0-9a-f]+|[a-z]+);/gi, (match, body) => {
+		if (body[0] === "#") {
+			const code = body[1] === "x" || body[1] === "X" ? Number.parseInt(body.slice(2), 16) : Number.parseInt(body.slice(1), 10);
+			return Number.isFinite(code) && code >= 0 && code <= 1114111 ? String.fromCodePoint(code) : match;
+		}
+		return NAMED[body.toLowerCase()] ?? match;
+	});
+}
+//#endregion
 //#region src/api/confluence.ts
 async function fetchPage(client, site, id) {
 	const page = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}?body-format=atlas_doc_format`);
@@ -382,6 +418,34 @@ async function fetchPage(client, site, id) {
 		comments
 	};
 }
+async function searchPages(client, site, params) {
+	const cql = buildCql(params);
+	const query = new URLSearchParams({
+		cql,
+		limit: String(params.limit),
+		expand: "space"
+	});
+	const results = (await client.getJson(`/wiki/rest/api/search?${query.toString()}`)).results ?? [];
+	return {
+		pages: results.filter((r) => r.content?.id).map((r) => ({
+			id: r.content?.id ?? "",
+			space: r.space?.key ?? r.resultGlobalContainer?.title ?? "",
+			title: decodeEntities(r.content?.title ?? r.title ?? ""),
+			url: r.url ? `${site}/wiki${r.url}` : ""
+		})),
+		hasMore: results.length === params.limit
+	};
+}
+function buildCql(params) {
+	if (params.cql) return params.cql;
+	const clauses = ["type = page"];
+	if (params.space) clauses.push(`space = ${cqlValue(params.space)}`);
+	if (params.text) clauses.push(`text ~ ${cqlValue(params.text)}`);
+	return `${clauses.join(" AND ")} ORDER BY lastmodified DESC`;
+}
+function cqlValue(value) {
+	return `"${value.replace(/(["\\])/g, "\\$1")}"`;
+}
 async function fetchSpaceKey(client, spaceId) {
 	if (!spaceId) return "";
 	try {
@@ -519,15 +583,115 @@ function parsePageId(input) {
 	if (fromQuery) return fromQuery[1];
 	return null;
 }
+function parseLimit(value) {
+	if (!value) return 25;
+	const n = Number.parseInt(value, 10);
+	if (!Number.isFinite(n) || n < 1) throw new Error(`Invalid --limit "${value}".`);
+	return Math.min(n, 100);
+}
+//#endregion
+//#region src/commands/search-run.ts
+const COPY_CONCURRENCY = 5;
+async function runSearch(rows, options, noun, copyOne) {
+	if (options.json) {
+		console.log(JSON.stringify(rows.map((r) => r.json), null, 2));
+		return;
+	}
+	if (rows.length === 0) {
+		console.log(`No matching ${noun.plural}.`);
+		return;
+	}
+	if (options.copy) {
+		if (options.out?.endsWith(".md")) throw new Error("--out must be a directory when using --copy; a .md file path would overwrite each selection.");
+		await copySelected(rows, noun, copyOne);
+		return;
+	}
+	for (const row of rows) console.log(formatRow(row));
+	if (options.hasMore) console.log(`\nShowing first ${options.limit}; refine with flags or raise --limit.`);
+}
+async function copySelected(rows, noun, copyOne) {
+	if (!process.stdin.isTTY) throw new Error("--copy requires an interactive terminal.");
+	const selected = await checkbox({
+		message: `Select ${noun.plural} to copy:`,
+		choices: rows.map((r) => ({
+			name: formatRow(r),
+			value: r.id
+		})),
+		pageSize: 20
+	});
+	if (selected.length === 0) {
+		console.log("Nothing selected.");
+		return;
+	}
+	let copied = 0;
+	const failures = [];
+	const queue = [...selected];
+	async function worker() {
+		for (let id = queue.shift(); id !== void 0; id = queue.shift()) try {
+			await copyOne(id);
+			copied++;
+		} catch (err) {
+			failures.push(`${id} (${err instanceof Error ? err.message : String(err)})`);
+		}
+	}
+	await Promise.all(Array.from({ length: Math.min(COPY_CONCURRENCY, selected.length) }, worker));
+	const summary = `Copied ${copied} ${copied === 1 ? noun.singular : noun.plural}`;
+	if (failures.length === 0) console.log(summary);
+	else console.log(`${summary}, failed ${failures.length}: ${failures.join(", ")}`);
+}
+function formatRow(row) {
+	const room = (process.stdout.columns ?? 80) - row.prefix.length - 2;
+	const text = room > 0 ? truncate(row.text, room) : "";
+	return text ? `${row.prefix}  ${text}` : row.prefix;
+}
+function truncate(text, max) {
+	const clean = text.replace(/\s+/g, " ").trim();
+	return clean.length <= max ? clean : `${clean.slice(0, Math.max(0, max - 3))}...`;
+}
 //#endregion
 //#region src/commands/confluence.ts
 async function confluenceCopy(arg, options) {
 	const auth = await requireAuth();
 	const id = await resolveId(arg);
+	await copyPage(new AtlassianClient(auth), auth.site, id, options.out);
+}
+async function confluenceSearch(query, options) {
+	if (options.cql && (query || options.space)) throw new Error("--cql cannot be combined with a text query or --space.");
+	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
+	const auth = await requireAuth();
 	const client = new AtlassianClient(auth);
+	const limit = parseLimit(options.limit);
+	const { pages, hasMore } = await searchPages(client, auth.site, {
+		text: query,
+		space: options.space,
+		cql: options.cql,
+		limit
+	});
+	await runSearch(pages.map((p) => ({
+		id: p.id,
+		prefix: `${p.id}  ${p.space}`,
+		text: p.title,
+		json: {
+			id: p.id,
+			space: p.space,
+			title: p.title,
+			url: p.url
+		}
+	})), {
+		json: options.json,
+		copy: options.copy,
+		limit,
+		hasMore,
+		out: options.out
+	}, {
+		singular: "page",
+		plural: "pages"
+	}, (id) => copyPage(client, auth.site, id, options.out));
+}
+async function copyPage(client, site, id, out) {
 	console.log(`Fetching page ${id} ...`);
-	const page = await fetchPage(client, auth.site, id);
-	const target = resolveOutput(`${page.id}-${slugify(page.title)}`, options.out);
+	const page = await fetchPage(client, site, id);
+	const target = resolveOutput(`${page.id}-${slugify(page.title)}`, out);
 	const downloaded = await downloadAttachments(client, page.attachments, target.assetsDir, target.assetsDirName);
 	const resolveMedia = mediaResolver(downloaded);
 	const document = joinSections([
@@ -599,6 +763,33 @@ async function fetchIssue(client, site, key) {
 		}))
 	};
 }
+async function searchIssues(client, site, params) {
+	const jql = buildJql(params);
+	const query = new URLSearchParams({
+		jql,
+		maxResults: String(params.limit),
+		fields: "summary,status"
+	});
+	return ((await client.getJson(`/rest/api/3/search/jql?${query.toString()}`)).issues ?? []).map((i) => ({
+		key: i.key,
+		status: i.fields?.status?.name ?? "",
+		summary: decodeEntities(i.fields?.summary ?? ""),
+		url: `${site}/browse/${i.key}`
+	}));
+}
+function buildJql(params) {
+	if (params.jql) return params.jql;
+	const clauses = [];
+	if (params.project) clauses.push(`project = ${jqlValue(params.project)}`);
+	if (params.assignee) clauses.push(params.assignee === "me" ? "assignee = currentUser()" : `assignee = ${jqlValue(params.assignee)}`);
+	if (params.status) clauses.push(`status = ${jqlValue(params.status)}`);
+	if (params.text) clauses.push(`text ~ ${jqlValue(params.text)}`);
+	if (clauses.length === 0) clauses.push("updated >= -30d");
+	return `${clauses.join(" AND ")} ORDER BY updated DESC`;
+}
+function jqlValue(value) {
+	return `"${value.replace(/(["\\])/g, "\\$1")}"`;
+}
 async function fetchComments(client, key) {
 	return (await client.getJson(`/rest/api/3/issue/${encodeURIComponent(key)}/comment?maxResults=100&orderBy=created`)).comments.map((c) => ({
 		author: c.author?.displayName ?? "",
@@ -611,10 +802,47 @@ async function fetchComments(client, key) {
 async function jiraCopy(arg, options) {
 	const auth = await requireAuth();
 	const key = await resolveKey(arg);
+	await copyIssue(new AtlassianClient(auth), auth.site, key, options.out);
+}
+async function jiraSearch(query, options) {
+	if (options.jql && (query || options.project || options.assignee || options.status)) throw new Error("--jql cannot be combined with a text query or other filters.");
+	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
+	const auth = await requireAuth();
 	const client = new AtlassianClient(auth);
+	const limit = parseLimit(options.limit);
+	const issues = await searchIssues(client, auth.site, {
+		text: query,
+		project: options.project,
+		assignee: options.assignee,
+		status: options.status,
+		jql: options.jql,
+		limit
+	});
+	await runSearch(issues.map((i) => ({
+		id: i.key,
+		prefix: `${i.key}  ${i.status}`,
+		text: i.summary,
+		json: {
+			key: i.key,
+			status: i.status,
+			summary: i.summary,
+			url: i.url
+		}
+	})), {
+		json: options.json,
+		copy: options.copy,
+		limit,
+		hasMore: issues.length === limit,
+		out: options.out
+	}, {
+		singular: "issue",
+		plural: "issues"
+	}, (key) => copyIssue(client, auth.site, key, options.out));
+}
+async function copyIssue(client, site, key, out) {
 	console.log(`Fetching ${key} ...`);
-	const issue = await fetchIssue(client, auth.site, key);
-	const target = resolveOutput(issue.key, options.out);
+	const issue = await fetchIssue(client, site, key);
+	const target = resolveOutput(issue.key, out);
 	const downloaded = await downloadAttachments(client, issue.attachments, target.assetsDir, target.assetsDirName);
 	const resolveMedia = mediaResolver(downloaded);
 	const document = joinSections([
@@ -659,8 +887,12 @@ const auth = program.command("auth").description("Manage Atlassian credentials")
 auth.command("login").description("Store site, email, and API token").action(run(login));
 auth.command("logout").description("Remove stored credentials").action(run(logout));
 auth.command("status").description("Show the current login").action(run(status));
-program.command("jira").description("Jira commands").command("copy [issue]").description("Copy a Jira issue (key or URL) to a Markdown file").option("-o, --out <path>", "output file or directory").action(run(jiraCopy));
-program.command("confluence").description("Confluence commands").command("copy [page]").description("Copy a Confluence page (id or URL) to a Markdown file").option("-o, --out <path>", "output file or directory").action(run(confluenceCopy));
+const jira = program.command("jira").description("Jira commands");
+jira.command("copy [issue]").description("Copy a Jira issue (key or URL) to a Markdown file").option("-o, --out <path>", "output file or directory").action(run(jiraCopy));
+jira.command("search [query]").description("Search Jira issues (text query, filters, or --jql)").option("-p, --project <key>", "limit to a project").option("-a, --assignee <who>", "limit to an assignee (or 'me')").option("-s, --status <status>", "limit to a status").option("--jql <jql>", "raw JQL query (ignores other filters)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").option("-c, --copy", "pick results to copy to Markdown").option("-o, --out <dir>", "output directory for --copy").action(run(jiraSearch));
+const confluence = program.command("confluence").description("Confluence commands");
+confluence.command("copy [page]").description("Copy a Confluence page (id or URL) to a Markdown file").option("-o, --out <path>", "output file or directory").action(run(confluenceCopy));
+confluence.command("search [query]").description("Search Confluence pages (text query, --space, or --cql)").option("-s, --space <key>", "limit to a space").option("--cql <cql>", "raw CQL query (ignores other filters)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").option("-c, --copy", "pick results to copy to Markdown").option("-o, --out <dir>", "output directory for --copy").action(run(confluenceSearch));
 program.parseAsync().catch(fail);
 function run(fn) {
 	return async (...args) => {

package/package.json

@@ -1,8 +1,12 @@
 {
 	"name": "atlass",
-	"version": "1.0.0",
+	"version": "1.1.0",
 	"description": "CLI to copy Jira issues and Confluence pages to Markdown.",
 	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/dan-livingston/atlass.git"
+	},
 	"bin": {
 		"atlass": "./dist/cli.mjs"
 	},