atlass 1.14.0 → 2.0.0

package/README.md

@@ -146,17 +146,29 @@ For both, `--json` and `--copy` work as for search.
 
 ```bash
 atlass jira search "safari login"
-atlass jira search --project PROJ --assignee me --status "In Progress"
-atlass jira search --jql "project = PROJ AND labels = regression"
-atlass confluence search "onboarding" --space DOCS
-atlass confluence search --cql "label = runbook ORDER BY created DESC"
+atlass jira search --project PROJ --assignee me --open
+atlass jira search --status "In Progress" --status "In Review" --updated 2w
+atlass confluence search "onboarding" --space DOCS --label runbook
 ```
 
-Filters combine with AND and sort by most recently updated. Rows use the same
-columns as `jira list` and `confluence list`. `--jql` and `--cql` replace the
-friendly filters. `--limit` defaults to 25, max 100. `--json` prints machine
-output. Add `--copy` to pick results interactively and copy each one, with
-`--out` as the target directory.
+Jira filters on `--project`, `--assignee`, `--reporter`, `--status`, `--type`,
+`--label`, `--updated` and `--open`; Confluence on `--space`, `--label`,
+`--updated` and `--starred`. Repeating a flag matches any of its values;
+different flags must all match. `--assignee` and `--reporter` take `me`, an
+account id, or a name to look up. `--updated` takes `7d`, `2w`, `3m` or
+`YYYY-MM-DD`. Results sort by most recently updated and use the same columns
+as `jira list` and `confluence list`.
+
+For anything the filters do not cover, write the query yourself:
+
+```bash
+atlass jira jql "project = PROJ AND labels = regression ORDER BY created DESC"
+atlass confluence cql "label = runbook AND creator = currentUser()"
+```
+
+`--limit` defaults to 25, max 100. `--json` prints machine output. Add `--copy`
+to pick results interactively and copy each one, with `--out` as the target
+directory. All four work on both search commands.
 
 Discovery aids for the filters:
 

package/dist/bitbucket.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as buildStandalone, r as fail } from "./build-CFyTL_x2.mjs";
+import { n as buildStandalone, r as fail } from "./build-DMLlCHdF.mjs";
 //#region src/bitbucket.ts
 buildStandalone("bitbucket").parseAsync().catch(fail);
 //#endregion

package/dist/{build-CFyTL_x2.mjs → build-DMLlCHdF.mjs}

@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { Entry } from "@napi-rs/keyring";
@@ -528,6 +528,41 @@ function siteOrigin(input) {
 	if (!/^https?:\/\//i.test(value)) value = `https://${value}`;
 	return new URL(value).origin;
 }
+const ISO_DATE = /^(\d{4})-(\d{2})-(\d{2})$/;
+const RELATIVE = /^(\d+)([dwm])$/i;
+function parseSince(value, nowMs) {
+	const raw = value.trim();
+	const iso = ISO_DATE.exec(raw);
+	if (iso) {
+		if (!isRealDate(iso)) throw invalidSince(value);
+		return raw;
+	}
+	const relative = RELATIVE.exec(raw);
+	if (!relative) throw invalidSince(value);
+	const amount = Number.parseInt(relative[1], 10);
+	const date = new Date(nowMs);
+	switch (relative[2].toLowerCase()) {
+		case "d":
+			date.setDate(date.getDate() - amount);
+			break;
+		case "w":
+			date.setDate(date.getDate() - amount * 7);
+			break;
+		default: date.setMonth(date.getMonth() - amount);
+	}
+	return localDate(date);
+}
+function isRealDate([, year = "", month = "", day = ""]) {
+	const date = new Date(Number(year), Number(month) - 1, Number(day));
+	return date.getFullYear() === Number(year) && date.getMonth() === Number(month) - 1 && date.getDate() === Number(day);
+}
+function localDate(date) {
+	const month = String(date.getMonth() + 1).padStart(2, "0");
+	return `${date.getFullYear()}-${month}-${String(date.getDate()).padStart(2, "0")}`;
+}
+function invalidSince(value) {
+	return /* @__PURE__ */ new Error(`Invalid --updated "${value}". Expected 7d, 2w, 3m, or YYYY-MM-DD.`);
+}
 //#endregion
 //#region src/commands/auth.ts
 async function login({ term, profile }) {
@@ -1520,6 +1555,19 @@ function hyperlink(text, url) {
 }
 //#endregion
 //#region src/commands/search-run.ts
+function checkedLimit(options) {
+	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
+	return parseLimit(options.limit);
+}
+async function showRows(term, rows, listing, options, noun, copyOne) {
+	await runSearch(term, rows, {
+		json: options.json,
+		copy: options.copy,
+		out: options.out,
+		empty: listing.empty,
+		footer: listing.hasMore ? searchFooter(listing.limit) : void 0
+	}, noun, copyOne);
+}
 function alignedRows(items, nowMs, cells) {
 	const rows = items.map((item) => {
 		const cell = cells(item);
@@ -1829,6 +1877,103 @@ function registerBitbucket(bitbucket) {
 	return bitbucket;
 }
 //#endregion
+//#region src/cli/search-options.ts
+function collect(value, previous = []) {
+	return [...previous, value];
+}
+function moved(flags, command) {
+	const flag = flags.split(" ")[0];
+	return new Option(flags).hideHelp().argParser(() => {
+		throw new Error(`${flag} is now its own command: \`atlass ${command} "<query>"\`.`);
+	});
+}
+function outputOptions(command) {
+	return command.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");
+}
+//#endregion
+//#region src/api/query.ts
+function quote$1(value) {
+	return `"${value.replace(/(["\\])/g, "\\$1")}"`;
+}
+function values(given) {
+	return (given ?? []).map((v) => v.trim()).filter((v) => v.length > 0);
+}
+function inClause(field, given) {
+	return renderClause(field, values(given).map(quote$1));
+}
+function userClause(field, given) {
+	return renderClause(field, values(given).map((v) => v === "me" ? "currentUser()" : quote$1(v)));
+}
+function renderClause(field, rendered) {
+	if (rendered.length === 0) return null;
+	if (rendered.length === 1) return `${field} = ${rendered[0]}`;
+	return `${field} in (${rendered.join(", ")})`;
+}
+function joinClauses(clauses, order) {
+	return `${clauses.filter((c) => c !== null).join(" AND ")} ORDER BY ${order}`;
+}
+//#endregion
+//#region src/util/html.ts
+const MAX_CODE_POINT = 1114111;
+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 isCodePoint(code) ? String.fromCodePoint(code) : match;
+		}
+		return NAMED[body.toLowerCase()] ?? match;
+	});
+}
+function isCodePoint(code) {
+	return Number.isFinite(code) && code >= 0 && code <= MAX_CODE_POINT;
+}
+//#endregion
+//#region src/api/confluence-search.ts
+async function searchPages(client, site, params) {
+	return searchPagesByCql(client, site, buildCql(params), params.limit);
+}
+async function searchPagesByCql(client, site, cql, limit) {
+	const query = new URLSearchParams({
+		cql,
+		limit: String(limit),
+		expand: "content.space"
+	});
+	const results = (await client.getJson(`/wiki/rest/api/search?${query.toString()}`)).results ?? [];
+	const serverPageWasFull = results.length === limit;
+	return {
+		pages: results.filter((r) => r.content?.id).map((r) => ({
+			id: r.content?.id ?? "",
+			space: r.content?.space?.key ?? spaceKeyOf(r.resultGlobalContainer?.displayUrl),
+			title: decodeEntities(r.content?.title ?? r.title ?? ""),
+			updated: r.lastModified ?? "",
+			url: r.url ? `${site}/wiki${r.url}` : ""
+		})),
+		hasMore: serverPageWasFull
+	};
+}
+const SPACE_URL = /\/spaces\/([^/?#]+)/;
+function spaceKeyOf(displayUrl) {
+	return SPACE_URL.exec(displayUrl ?? "")?.[1] ?? "";
+}
+function buildCql(params) {
+	return joinClauses([
+		"type = page",
+		params.starred ? "favourite = currentUser()" : null,
+		inClause("space", params.space),
+		inClause("label", params.label),
+		params.updatedSince ? `lastmodified >= ${quote$1(params.updatedSince)}` : null,
+		params.text ? `text ~ ${quote$1(params.text)}` : null
+	], "lastmodified DESC");
+}
+//#endregion
 //#region src/adf/from-markdown.ts
 function mediaNode(source, alt) {
 	const attrs = { ...source };
@@ -2160,62 +2305,6 @@ var UserNames = class {
 	}
 };
 //#endregion
-//#region src/util/html.ts
-const MAX_CODE_POINT = 1114111;
-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 isCodePoint(code) ? String.fromCodePoint(code) : match;
-		}
-		return NAMED[body.toLowerCase()] ?? match;
-	});
-}
-function isCodePoint(code) {
-	return Number.isFinite(code) && code >= 0 && code <= MAX_CODE_POINT;
-}
-//#endregion
-//#region src/api/confluence-search.ts
-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 ?? [];
-	const serverPageWasFull = results.length === params.limit;
-	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 ?? ""),
-			updated: r.lastModified ?? "",
-			url: r.url ? `${site}/wiki${r.url}` : ""
-		})),
-		hasMore: serverPageWasFull
-	};
-}
-function buildCql(params) {
-	if (params.cql) return params.cql;
-	const clauses = ["type = page"];
-	if (params.starred) clauses.push("favourite = currentUser()");
-	if (params.space) clauses.push(`space = ${cqlStringLiteral(params.space)}`);
-	if (params.text) clauses.push(`text ~ ${cqlStringLiteral(params.text)}`);
-	return `${clauses.join(" AND ")} ORDER BY lastmodified DESC`;
-}
-function cqlStringLiteral(value) {
-	return `"${value.replace(/(["\\])/g, "\\$1")}"`;
-}
-//#endregion
 //#region src/commands/resolve-ref.ts
 async function resolveRef(ask, arg, kind) {
 	const raw = arg ?? await ask.text({
@@ -2794,35 +2883,52 @@ async function fileSize(files, path) {
 		return {};
 	}
 }
+async function copyPage(env, id, out) {
+	env.term.err(`Fetching page ${id} ...`);
+	await runCopy(env, planPageCopy(await fetchPage(env.session, env.session.site, id), out));
+}
+const PAGE_REF = {
+	message: "Confluence page id or URL:",
+	flag: "[page]",
+	parse: parsePageId,
+	notFound: (raw) => `Could not find a page id in "${raw}".`
+};
+//#endregion
+//#region src/commands/confluence-search.ts
 async function confluenceSearch(env, query, options) {
-	if (options.cql && (query || options.space)) throw new Error("--cql cannot be combined with a text query or --space.");
 	await listPages(env, {
 		text: query,
 		space: options.space,
-		cql: options.cql
+		label: options.label,
+		starred: options.starred,
+		updatedSince: options.updated ? parseSince(options.updated, Date.now()) : void 0
 	}, "No matching pages.", options);
 }
 async function confluenceList(env, options) {
 	await listPages(env, {
 		starred: true,
-		space: options.space
+		space: options.space ? [options.space] : void 0
 	}, options.space ? `No starred pages in ${options.space}.` : "No starred pages.", options);
 }
+async function confluenceCql(env, query, options) {
+	const limit = checkedLimit(options);
+	const { pages, hasMore } = await searchPagesByCql(env.session, env.session.site, query, limit);
+	await showPages(env, pages, hasMore, limit, options);
+}
 async function listPages(env, filter, empty, options) {
-	const { session, term } = env;
-	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
-	const limit = parseLimit(options.limit);
-	const { pages, hasMore } = await searchPages(session, session.site, {
+	const limit = checkedLimit(options);
+	const { pages, hasMore } = await searchPages(env.session, env.session.site, {
 		...filter,
 		limit
 	});
-	await runSearch(term, formatPageRows(pages, Date.now()), {
-		json: options.json,
-		copy: options.copy,
-		out: options.out,
+	await showPages(env, pages, hasMore, limit, options, empty);
+}
+async function showPages(env, pages, hasMore, limit, options, empty = "No matching pages.") {
+	await showRows(env.term, formatPageRows(pages, Date.now()), {
 		empty,
-		footer: hasMore ? searchFooter(limit) : void 0
-	}, PAGE_NOUN, (id) => copyPage(env, id, options.out));
+		hasMore,
+		limit
+	}, options, PAGE_NOUN, (id) => copyPage(env, id, options.out));
 }
 function formatPageRows(pages, nowMs) {
 	return alignedRows(pages, nowMs, (p) => ({
@@ -2850,16 +2956,6 @@ const PAGE_NOUN = {
 	singular: "page",
 	plural: "pages"
 };
-async function copyPage(env, id, out) {
-	env.term.err(`Fetching page ${id} ...`);
-	await runCopy(env, planPageCopy(await fetchPage(env.session, env.session.site, id), out));
-}
-const PAGE_REF = {
-	message: "Confluence page id or URL:",
-	flag: "[page]",
-	parse: parsePageId,
-	notFound: (raw) => `Could not find a page id in "${raw}".`
-};
 //#endregion
 //#region src/cli/confluence.ts
 function registerConfluence(confluence) {
@@ -2867,8 +2963,9 @@ function registerConfluence(confluence) {
 	confluence.command("view [page]").description("Show a Confluence page (id or URL) in the terminal").option("--all-comments", "show all comments instead of the last 5").option("--no-pager", "print directly instead of paging long output").action(jiraAction(confluenceView));
 	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(jiraAction(confluenceCopy));
 	confluence.command("update [file]").description("Update a Confluence page from an edited Markdown file").option("--title", "also push the H1 as the page title").option("-m, --message <text>", "version message (default 'Updated via atlass')").option("-f, --force", "skip the stale-version and data-loss checks").option("--dry-run", "show what would change without writing").action(jiraAction(confluenceUpdate));
-	confluence.command("list").description("List pages you starred").option("-s, --space <key>", "limit to a space").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(jiraAction(confluenceList));
-	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(jiraAction(confluenceSearch));
+	outputOptions(confluence.command("list").description("List pages you starred").option("-s, --space <key>", "limit to a space")).action(jiraAction(confluenceList));
+	outputOptions(confluence.command("search [query]").description("Search Confluence pages by text and filters").option("-s, --space <key>", "limit to a space (repeatable)", collect).option("--label <label>", "limit to a label (repeatable)", collect).option("--starred", "limit to pages you starred").option("-u, --updated <when>", "changed since 7d, 2w, 3m, or YYYY-MM-DD").addOption(moved("--cql <cql>", "confluence cql"))).action(jiraAction(confluenceSearch));
+	outputOptions(confluence.command("cql <query>").description("Search Confluence pages with a raw CQL query")).action(jiraAction(confluenceCql));
 	return confluence;
 }
 //#endregion
@@ -2937,6 +3034,24 @@ async function searchAssignableUsers(client, project, query) {
 	});
 	return (await client.getJson(`/rest/api/3/user/assignable/search?${params.toString()}`)).map(toJiraUser);
 }
+const ACCOUNT_ID = /^(?:[0-9a-z]{24}|[a-z0-9]+:[0-9a-f-]{36}(?::[0-9a-f-]{36})?)$/i;
+async function searchUsers(client, query) {
+	const params = new URLSearchParams({
+		query,
+		maxResults: "20"
+	});
+	return (await client.getJson(`/rest/api/3/user/search?${params.toString()}`)).map(toJiraUser);
+}
+function matchUser(users, query, noun) {
+	const active = users.filter((u) => u.active);
+	const needle = query.toLowerCase();
+	const exact = active.filter((u) => u.displayName.toLowerCase() === needle || u.email.toLowerCase() === needle);
+	const candidates = exact.length === 1 ? exact : active;
+	if (candidates.length === 1) return candidates[0].accountId;
+	if (candidates.length === 0) throw new Error(`no ${noun} matches "${query}".`);
+	const names = candidates.map((u) => u.displayName).join(", ");
+	throw new Error(`"${query}" matches ${candidates.length} users: ${names}.`);
+}
 async function fetchMyself(client) {
 	return toJiraUser(await client.getJson("/rest/api/3/myself"));
 }
@@ -3014,18 +3129,11 @@ function matchType(types, arg) {
 	const needle = arg.trim().toLowerCase();
 	return types.find((t) => t.id === arg.trim()) ?? types.find((t) => t.name.toLowerCase() === needle);
 }
-const ACCOUNT_ID = /^(?:[0-9a-f]{24}|[a-z0-9]+:[0-9a-f-]{36}(?::[0-9a-f-]{36})?)$/i;
 function userResolver(client, project) {
 	return async (query) => {
 		if (query === "me") return (await fetchMyself(client)).accountId;
 		if (ACCOUNT_ID.test(query)) return query;
-		const users = (await searchAssignableUsers(client, project, query)).filter((u) => u.active);
-		const exact = users.filter((u) => u.displayName.toLowerCase() === query.toLowerCase() || u.email.toLowerCase() === query.toLowerCase());
-		const candidates = exact.length === 1 ? exact : users;
-		if (candidates.length === 1) return candidates[0].accountId;
-		if (candidates.length === 0) throw new Error(`no assignable user matches "${query}".`);
-		const names = candidates.map((u) => u.displayName).join(", ");
-		throw new Error(`"${query}" matches ${candidates.length} users: ${names}.`);
+		return matchUser(await searchAssignableUsers(client, project, query), query, "assignable user");
 	};
 }
 //#endregion
@@ -3639,9 +3747,13 @@ async function jiraFields({ session, term }, projectArg, typeArg, options) {
 //#endregion
 //#region src/api/jira-search.ts
 const RECENT_ISSUES_CLAUSE = "updated >= -30d";
+const OPEN_CLAUSE = "statusCategory != Done";
 const SEARCH_FIELDS = "summary,status,updated";
 async function searchIssues(client, site, params) {
-	return ((await fetchSearchPage(client, buildJql(params), params.limit)).issues ?? []).map((i) => toIssueSummary(site, i));
+	return searchIssuesByJql(client, site, buildJql(params), params.limit);
+}
+async function searchIssuesByJql(client, site, jql, limit) {
+	return ((await fetchSearchPage(client, jql, limit)).issues ?? []).map((i) => toIssueSummary(site, i));
 }
 async function fetchSearchPage(client, jql, maxResults, nextPageToken) {
 	const query = new URLSearchParams({
@@ -3662,22 +3774,28 @@ function toIssueSummary(site, i) {
 		url: browseUrl(site, i.key)
 	};
 }
+const ISSUE_ORDER = "updated DESC";
 function buildJql(params) {
-	if (params.jql) return params.jql;
-	const clauses = [];
-	if (params.project) clauses.push(`project = ${jqlStringLiteral(params.project)}`);
-	if (params.assignee) clauses.push(params.assignee === "me" ? "assignee = currentUser()" : `assignee = ${jqlStringLiteral(params.assignee)}`);
-	if (params.status) clauses.push(`status = ${jqlStringLiteral(params.status)}`);
-	if (params.text) clauses.push(`text ~ ${jqlStringLiteral(params.text)}`);
+	const clauses = [
+		inClause("project", params.project),
+		inClause("type", params.type),
+		inClause("status", params.status),
+		params.open ? OPEN_CLAUSE : null,
+		userClause("assignee", params.assignee),
+		userClause("reporter", params.reporter),
+		inClause("labels", params.label),
+		params.updatedSince ? `updated >= ${quote$1(params.updatedSince)}` : null,
+		params.text ? `text ~ ${quote$1(params.text)}` : null
+	].filter((c) => c !== null);
 	if (clauses.length === 0) clauses.push(RECENT_ISSUES_CLAUSE);
-	return `${clauses.join(" AND ")} ORDER BY updated DESC`;
+	return joinClauses(clauses, ISSUE_ORDER);
 }
-const OPEN_CLAUSE = "statusCategory != Done";
 function buildListJql(params) {
-	const clauses = ["assignee = currentUser()"];
-	if (params.project) clauses.push(`project = ${jqlStringLiteral(params.project)}`);
-	clauses.push(params.all ? `(${OPEN_CLAUSE} OR ${RECENT_ISSUES_CLAUSE})` : OPEN_CLAUSE);
-	return `${clauses.join(" AND ")} ORDER BY updated DESC`;
+	return joinClauses([
+		"assignee = currentUser()",
+		params.project ? `project = ${quote$1(params.project)}` : null,
+		params.all ? `(${OPEN_CLAUSE} OR ${RECENT_ISSUES_CLAUSE})` : OPEN_CLAUSE
+	], ISSUE_ORDER);
 }
 const LIST_PAGE_SIZE = 100;
 const LIST_CAP = 500;
@@ -3712,8 +3830,59 @@ function sortByCategoryThenUpdated(issues) {
 	const updatedMs = (i) => Date.parse(i.updated) || 0;
 	return [...issues].sort((a, b) => rank(a) - rank(b) || updatedMs(b) - updatedMs(a));
 }
-function jqlStringLiteral(value) {
-	return `"${value.replace(/(["\\])/g, "\\$1")}"`;
+//#endregion
+//#region src/commands/jira-filters.ts
+const FILTER_FLAGS = [
+	"project",
+	"assignee",
+	"reporter",
+	"status",
+	"type",
+	"label"
+];
+const ISSUE_KEY = /^[A-Z][A-Z0-9]+-\d+$/i;
+function hasFilters(filters) {
+	return FILTER_FLAGS.some((flag) => values(filters[flag]).length > 0) || filters.updated !== void 0 || filters.open === true;
+}
+function checkQuery(query, filters) {
+	if (query && ISSUE_KEY.test(query.trim())) throw new Error(`"${query}" looks like an issue key. Run \`jira view ${query}\` to open it.`);
+	if (!query && !hasFilters(filters)) throw new Error("Give a text query or at least one filter. `jira list` shows your open issues.");
+}
+async function searchParams(client, query, filters, limit, nowMs) {
+	return {
+		text: query,
+		project: filters.project,
+		assignee: await resolveUsers(client, filters.assignee),
+		reporter: await resolveUsers(client, filters.reporter),
+		status: filters.status,
+		type: filters.type,
+		label: filters.label,
+		updatedSince: filters.updated ? parseSince(filters.updated, nowMs) : void 0,
+		open: filters.open,
+		limit
+	};
+}
+async function resolveUsers(client, given) {
+	const list = values(given);
+	if (list.length === 0) return void 0;
+	const resolved = [];
+	for (const who of list) if (who === "me" || ACCOUNT_ID.test(who)) resolved.push(who);
+	else resolved.push(matchUser(await searchUsers(client, who), who, "user"));
+	return resolved;
+}
+const FIELD_IN_MESSAGE = /for the field '([^']+)'/;
+const createForm = (project) => `jira fields ${project ?? "<project>"}`;
+const DISCOVERY = {
+	project: () => "jira projects",
+	status: (p) => p ? `jira statuses --project ${p}` : "jira statuses",
+	issuetype: createForm,
+	type: createForm
+};
+function searchHint(err, project) {
+	if (!(err instanceof HttpError) || err.status !== 400) return err;
+	const field = FIELD_IN_MESSAGE.exec(err.message)?.[1]?.toLowerCase();
+	const command = field ? DISCOVERY[field]?.(values(project)[0]) : void 0;
+	return command ? /* @__PURE__ */ new Error(`${err.message} Run \`${command}\` to see the options.`) : err;
 }
 //#endregion
 //#region src/api/jira-issues.ts
@@ -3900,29 +4069,29 @@ const ISSUE_REF = {
 //#endregion
 //#region src/commands/jira-search.ts
 async function jiraSearch(env, query, options) {
-	const { session, term } = env;
-	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 limit = parseLimit(options.limit);
-	const issues = await searchIssues(session, session.site, {
-		text: query,
-		project: options.project,
-		assignee: options.assignee,
-		status: options.status,
-		jql: options.jql,
+	const { session } = env;
+	checkQuery(query, options);
+	const limit = checkedLimit(options);
+	const params = await searchParams(session, query, options, limit, Date.now());
+	await showIssues(env, await searchIssues(session, session.site, params).catch((err) => {
+		throw searchHint(err, options.project);
+	}), limit, options);
+}
+async function jiraJql(env, query, options) {
+	const { session } = env;
+	const limit = checkedLimit(options);
+	await showIssues(env, await searchIssuesByJql(session, session.site, query, limit), limit, options);
+}
+async function showIssues(env, issues, limit, options, empty = "No matching issues.") {
+	await showRows(env.term, formatIssueRows(issues, Date.now()), {
+		empty,
+		hasMore: issues.length === limit,
 		limit
-	});
-	await runSearch(term, formatIssueRows(issues, Date.now()), {
-		json: options.json,
-		copy: options.copy,
-		out: options.out,
-		empty: "No matching issues.",
-		footer: issues.length === limit ? searchFooter(limit) : void 0
-	}, ISSUE_NOUN, (key) => copyIssue(env, key, options.out));
+	}, options, ISSUE_NOUN, (key) => copyIssue(env, key, options.out));
 }
 async function jiraList(env, options) {
 	const { session, term } = env;
-	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
+	checkedLimit(options);
 	const { issues, truncated } = await listAssignedIssues(session, session.site, {
 		all: options.all,
 		project: options.project
@@ -3951,25 +4120,23 @@ const ISSUE_NOUN = {
 };
 //#endregion
 //#region src/cli/jira.ts
-function collect(value, previous = []) {
-	return [...previous, value];
-}
 function registerJira(jira) {
 	jira.description("Jira commands");
 	jira.command("projects [query]").description("List projects (optionally filtered by key or name)").option("--json", "output results as JSON").action(jiraAction(jiraProjects));
 	jira.command("statuses [query]").description("List statuses (optionally filtered by name, scoped with --project)").option("-p, --project <key>", "limit to statuses used by a project").option("--json", "output results as JSON").action(jiraAction(jiraStatuses));
-	jira.command("create [project] [type]").description("Create a Jira issue, prompting for fields or taking them all as flags").option("-s, --summary <text>", "issue summary").option("-d, --description <markdown>", "description as Markdown").option("--description-file <path>", "read the description from a Markdown file").option("-a, --assignee <who>", "assignee: me, an account id, or a name to look up").option("--priority <name>", "priority name").option("-l, --label <label>", "label (repeatable, or comma separated)", collect).option("-c, --component <name>", "component (repeatable, or comma separated)", collect).option("--parent <key>", "parent issue key for subtasks").option("-f, --field <name=value>", "any other create-screen field (repeatable)", collect).option("--dry-run", "print the resolved payload instead of creating").option("--json", "print the created issue as JSON").action(jiraAction(jiraCreate));
+	jira.command("create [project] [type]").description("Create a Jira issue, prompting for fields or taking them all as flags").option("-s, --summary <text>", "issue summary").option("-d, --description <markdown>", "description as Markdown").option("--description-file <path>", "read the description from a Markdown file").option("-a, --assignee <who>", "assignee: me, an account id, or a name to look up").option("--priority <name>", "priority name").option("-l, --label <label>", "label (repeatable)", collect).option("-c, --component <name>", "component (repeatable)", collect).option("--parent <key>", "parent issue key for subtasks").option("-f, --field <name=value>", "any other create-screen field (repeatable)", collect).option("--dry-run", "print the resolved payload instead of creating").option("--json", "print the created issue as JSON").action(jiraAction(jiraCreate));
 	jira.command("fields <project> [type]").description("Show the issue types you can create in a project, or the create form for one type").option("--json", "output results as JSON").action(jiraAction(jiraFields));
 	jira.command("view [issue]").description("Show a Jira issue (key or URL) in the terminal").option("--all-comments", "show all comments instead of the last 5").option("--no-pager", "print directly instead of paging long output").action(jiraAction(jiraView));
 	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(jiraAction(jiraCopy));
 	jira.command("update [file]").description("Update a Jira issue description from an edited Markdown file").option("--summary", "also push the H1 as the issue summary").option("-f, --force", "skip the stale-issue and data-loss checks").option("--dry-run", "show what would change without writing").action(jiraAction(jiraUpdate));
-	jira.command("list").description("List open issues assigned to you").option("-p, --project <key>", "limit to a project").option("-a, --all", "include Done issues updated in the last 30 days").option("--json", "output results as JSON").option("-c, --copy", "pick results to copy to Markdown").option("-o, --out <dir>", "output directory for --copy").action(jiraAction(jiraList));
-	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(jiraAction(jiraSearch));
+	outputOptions(jira.command("list").description("List open issues assigned to you").option("-p, --project <key>", "limit to a project").option("-a, --all", "include Done issues updated in the last 30 days")).action(jiraAction(jiraList));
+	outputOptions(jira.command("search [query]").description("Search Jira issues by text and filters").option("-p, --project <key>", "limit to a project (repeatable)", collect).option("-a, --assignee <who>", "limit to an assignee: me, a name, or an account id", collect).option("--reporter <who>", "limit to a reporter: me, a name, or an account id", collect).option("-s, --status <status>", "limit to a status (repeatable)", collect).option("-t, --type <type>", "limit to an issue type (repeatable)", collect).option("--label <label>", "limit to a label (repeatable)", collect).option("-u, --updated <when>", "changed since 7d, 2w, 3m, or YYYY-MM-DD").option("--open", "exclude issues in the Done category").addOption(moved("--jql <jql>", "jira jql"))).action(jiraAction(jiraSearch));
+	outputOptions(jira.command("jql <query>").description("Search Jira issues with a raw JQL query")).action(jiraAction(jiraJql));
 	return jira;
 }
 //#endregion
 //#region package.json
-var version = "1.14.0";
+var version = "2.0.0";
 //#endregion
 //#region src/cli/build.ts
 const PRODUCTS = {

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { r as fail, t as buildAtlass } from "./build-CFyTL_x2.mjs";
+import { r as fail, t as buildAtlass } from "./build-DMLlCHdF.mjs";
 //#region src/cli.ts
 buildAtlass().parseAsync().catch(fail);
 //#endregion

package/dist/confluence.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as buildStandalone, r as fail } from "./build-CFyTL_x2.mjs";
+import { n as buildStandalone, r as fail } from "./build-DMLlCHdF.mjs";
 //#region src/confluence.ts
 buildStandalone("confluence").parseAsync().catch(fail);
 //#endregion

package/dist/jira.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as buildStandalone, r as fail } from "./build-CFyTL_x2.mjs";
+import { n as buildStandalone, r as fail } from "./build-DMLlCHdF.mjs";
 //#region src/jira.ts
 buildStandalone("jira").parseAsync().catch(fail);
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atlass",
-	"version": "1.14.0",
+	"version": "2.0.0",
 	"description": "CLI to copy Jira issues and Confluence pages to Markdown, and update Confluence pages.",
 	"license": "MIT",
 	"repository": {