atlass 1.13.0 → 2.0.0

package/dist/{build-BblaPBOA.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";
@@ -7,25 +7,27 @@ import { spawn } from "node:child_process";
 import { stripVTControlCharacters } from "node:util";
 import { checkbox, confirm, editor, input, password, search, select } from "@inquirer/prompts";
 import kleur from "kleur";
+import { common, createLowlight } from "lowlight";
 import { marked } from "marked";
 import { randomUUID } from "node:crypto";
-import { common, createLowlight } from "lowlight";
 //#region src/api/http-error.ts
 var HttpError = class extends Error {
 	status;
 	jira;
+	path;
 	constructor(status, message, jira = {
 		errorMessages: [],
 		errors: {}
-	}) {
+	}, path = "") {
 		super(message);
 		this.status = status;
 		this.jira = jira;
+		this.path = path;
 		this.name = "HttpError";
 	}
 };
 function httpError(status, path, body, loginHint) {
-	if (status === 401 || status === 403) return new HttpError(status, `Authentication failed (401/403). Run \`${loginHint}\` to update your token.`);
+	if (status === 401 || status === 403) return new HttpError(status, `Authentication failed (401/403). Run \`${loginHint}\` to update your token.`, void 0, path);
 	if (status === 404) return new HttpError(status, `Not found (404): ${path}`);
 	if (status === 409) return new HttpError(status, `Conflict (409): ${extractErrorMessage(body) || "the page changed on the server"}`);
 	if (status === 413) return new HttpError(status, "Payload too large (413): the page or an attachment exceeds the size limit.");
@@ -460,6 +462,33 @@ function parsePageId(input) {
 	if (fromQuery) return fromQuery[1];
 	return null;
 }
+const PULL_REQUEST_HOSTS = ["bitbucket.org", "www.bitbucket.org"];
+const PULL_REQUEST_PATH = /^\/([^/]+)\/([^/]+)\/pull-requests\/(\d+)(?:\/|$)/;
+function parsePullRequestRef(input) {
+	const trimmed = input.trim();
+	const bare = trimmed.replace(/^#/, "");
+	if (/^\d+$/.test(bare)) return { id: Number.parseInt(bare, 10) };
+	if (!/^https?:\/\//i.test(trimmed)) return null;
+	const url = parseUrl(trimmed);
+	if (!url || !PULL_REQUEST_HOSTS.includes(url.hostname.toLowerCase())) return null;
+	const match = PULL_REQUEST_PATH.exec(url.pathname);
+	if (!match) return null;
+	const [, workspace = "", repo = "", id = ""] = match;
+	return {
+		id: Number.parseInt(id, 10),
+		repo: {
+			workspace: decodeURIComponent(workspace),
+			repo: decodeURIComponent(repo)
+		}
+	};
+}
+function parseUrl(value) {
+	try {
+		return new URL(value);
+	} catch {
+		return null;
+	}
+}
 function isExternalHref(href) {
 	return /^[a-z][a-z0-9+.-]*:\/\//i.test(href);
 }
@@ -499,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 }) {
@@ -659,13 +723,34 @@ async function* walkPages(client, firstPath) {
 		path = page.next ? pathAndQuery(page.next) : null;
 	}
 }
-async function collectPages(client, first, limit, map) {
-	const out = [];
-	for await (const value of walkPages(client, first)) {
-		out.push(map(value));
-		if (out.length >= limit) break;
+async function collectCapped(client, first, cap, map) {
+	const items = [];
+	let total;
+	let path = first;
+	while (path) {
+		const page = await client.getJson(path);
+		total ??= page.size;
+		for (const value of page.values ?? []) {
+			items.push(map(value));
+			if (items.length >= cap) return {
+				items,
+				total,
+				truncated: hasMore(page, total, cap)
+			};
+		}
+		path = page.next ? pathAndQuery(page.next) : null;
 	}
-	return out;
+	return {
+		items,
+		total: total ?? items.length,
+		truncated: false
+	};
+}
+function hasMore(page, total, cap) {
+	return total === void 0 ? Boolean(page.next) : total > cap;
+}
+async function collectPages(client, first, limit, map) {
+	return (await collectCapped(client, first, limit, map)).items;
 }
 //#endregion
 //#region src/api/bitbucket-pull-requests.ts
@@ -739,93 +824,115 @@ function toPullRequestSummary(ref, pr) {
 async function listPullRequests(client, ref, params) {
 	return collectPages(client, `${repoPath(ref, "pullrequests")}?${pullRequestsQuery(params)}`, params.limit, (value) => toPullRequestSummary(ref, value));
 }
-//#endregion
-//#region src/api/bitbucket-pipelines.ts
-const BUILD_NUMBER_SCAN_LIMIT = 1e3;
-function pipelineStatus(state) {
-	if (!state) return "";
-	if (state.name === "COMPLETED") return state.result?.name ?? "COMPLETED";
-	return state.name ?? "";
+const PAGELEN = 100;
+const RESOLUTION_FIELDS = "fields=%2Bvalues.resolution.*";
+function pullRequestPath(ref, id, resource) {
+	const base = `${repoPath(ref, "pullrequests")}/${id}`;
+	return resource ? `${base}/${resource}` : base;
 }
-function pipelinesQuery(limit) {
-	return new URLSearchParams({
-		sort: "-created_on",
-		pagelen: String(Math.min(Math.max(limit, 1), 100))
-	}).toString();
+function toPullRequestDetail(ref, value) {
+	return {
+		id: value.id,
+		title: value.title ?? "",
+		description: value.description ?? "",
+		state: value.state ?? "",
+		draft: value.draft ?? false,
+		author: value.author?.display_name ?? "",
+		sourceBranch: value.source?.branch?.name ?? "",
+		destinationBranch: value.destination?.branch?.name ?? "",
+		closedBy: value.closed_by?.display_name ?? "",
+		createdOn: value.created_on ?? "",
+		updatedOn: value.updated_on ?? "",
+		url: pullRequestUrl(ref, value.id),
+		reviewers: toReviewers(value),
+		participants: toParticipants(value)
+	};
 }
-function wallClockSeconds(startOn, endOn) {
-	if (!startOn || !endOn) return null;
-	const start = Date.parse(startOn);
-	const end = Date.parse(endOn);
-	if (Number.isNaN(start) || Number.isNaN(end)) return null;
-	return Math.floor((end - start) / 1e3);
+function toParticipants(value) {
+	const rows = /* @__PURE__ */ new Map();
+	const users = [value.author, ...(value.participants ?? []).map((entry) => entry.user)];
+	for (const user of users) {
+		if (!user?.account_id || !user.display_name) continue;
+		rows.set(user.account_id, {
+			accountId: user.account_id,
+			name: user.display_name
+		});
+	}
+	return [...rows.values()];
 }
-function shortHash(hash) {
-	return hash?.slice(0, 7) ?? "";
+function toReviewers(value) {
+	const rows = /* @__PURE__ */ new Map();
+	for (const requested of value.reviewers ?? []) rows.set(principalKey(requested), {
+		name: requested.display_name ?? "",
+		state: ""
+	});
+	for (const participant of value.participants ?? []) {
+		const state = participantState(participant);
+		if (participant.role !== "REVIEWER" && !state) continue;
+		rows.set(principalKey(participant.user ?? {}), {
+			name: participant.user?.display_name ?? "",
+			state
+		});
+	}
+	return [...rows.values()];
 }
-function pipelineUrl(ref, buildNumber) {
-	return `${BITBUCKET_WEB_ORIGIN}/${ref.workspace}/${ref.repo}/pipelines/results/${buildNumber}`;
+function participantState(participant) {
+	if (participant.state) return participant.state.toUpperCase();
+	return participant.approved ? "APPROVED" : "";
 }
-function toPipelineSummary(ref, p) {
-	return {
-		buildNumber: p.build_number,
-		status: pipelineStatus(p.state),
-		ref: p.target?.ref_name ?? "",
-		commit: shortHash(p.target?.commit?.hash),
-		durationSeconds: wallClockSeconds(p.created_on, p.completed_on),
-		createdOn: p.created_on ?? "",
-		creator: p.creator?.display_name ?? "",
-		uuid: p.uuid,
-		url: pipelineUrl(ref, p.build_number)
-	};
+function principalKey(user) {
+	return user.uuid ?? user.display_name ?? "";
 }
-function toPipelineDetail(ref, p) {
+function toComment(value) {
+	if (value.deleted) return null;
+	const body = value.content?.raw ?? "";
+	if (!body.trim()) return null;
 	return {
-		...toPipelineSummary(ref, p),
-		repo: p.repository?.full_name ?? "",
-		trigger: p.trigger?.name ?? ""
+		id: value.id,
+		parentId: value.parent?.id ?? null,
+		author: value.user?.display_name ?? "",
+		created: value.created_on ?? "",
+		body,
+		anchor: inlineAnchor(value),
+		resolved: toResolution(value.resolution)
 	};
 }
-function toStepSummary(step) {
+function toResolution(value) {
+	if (!value?.created_on) return null;
 	return {
-		name: step.name ?? "",
-		status: pipelineStatus(step.state),
-		durationSeconds: wallClockSeconds(step.started_on, step.completed_on)
+		by: value.user?.display_name ?? "",
+		at: value.created_on
 	};
 }
-function pipelinesPath(ref) {
-	return repoPath(ref, "pipelines");
-}
-async function listPipelines(client, ref, limit) {
-	return collectPages(client, `${pipelinesPath(ref)}?${pipelinesQuery(limit)}`, limit, (value) => toPipelineSummary(ref, value));
+function inlineAnchor(value) {
+	const path = value.inline?.path;
+	if (!path) return "";
+	const line = value.inline?.to ?? value.inline?.from;
+	return line == null ? path : `${path}:${line}`;
 }
-async function getPipeline(client, ref, buildNumber) {
-	const found = await fetchByBuildNumber(client, ref, buildNumber) ?? await findInRecentRuns(client, ref, buildNumber);
-	if (!found) throw new Error(`Could not find pipeline #${buildNumber} in the ${BUILD_NUMBER_SCAN_LIMIT} most recent runs. It may be too old.`);
-	return toPipelineDetail(ref, found);
+function toChangedFile(value) {
+	const before = value.old?.path ?? "";
+	const after = value.new?.path ?? "";
+	return {
+		path: before && after && before !== after ? `${before} -> ${after}` : after || before,
+		status: value.status ?? "",
+		added: value.lines_added ?? 0,
+		removed: value.lines_removed ?? 0
+	};
 }
-async function fetchByBuildNumber(client, ref, buildNumber) {
-	try {
-		return await client.getJson(`${pipelinesPath(ref)}/${encodeURIComponent(String(buildNumber))}`);
-	} catch (err) {
-		if (err instanceof HttpError && (err.status === 400 || err.status === 404)) return null;
-		throw err;
-	}
+async function getPullRequest(client, ref, id) {
+	return toPullRequestDetail(ref, await client.getJson(pullRequestPath(ref, id)));
 }
-async function findInRecentRuns(client, ref, buildNumber) {
-	const first = `${pipelinesPath(ref)}?${pipelinesQuery(100)}`;
-	let scanned = 0;
-	for await (const pipeline of walkPages(client, first)) {
-		if (pipeline.build_number === buildNumber) return pipeline;
-		if (++scanned >= BUILD_NUMBER_SCAN_LIMIT) break;
-	}
-	return null;
+async function listComments(client, ref, id) {
+	const page = await collectCapped(client, `${pullRequestPath(ref, id, "comments")}?pagelen=${PAGELEN}&${RESOLUTION_FIELDS}`, 200, toComment);
+	const items = page.items.filter((comment) => comment !== null).sort((a, b) => a.created.localeCompare(b.created));
+	return {
+		...page,
+		items
+	};
 }
-async function listSteps(client, ref, pipelineId) {
-	const out = [];
-	const first = `${pipelinesPath(ref)}/${encodeURIComponent(pipelineId)}/steps`;
-	for await (const step of walkPages(client, first)) out.push(toStepSummary(step));
-	return out;
+async function listChangedFiles(client, ref, id) {
+	return collectCapped(client, `${pullRequestPath(ref, id, "diffstat")}?pagelen=${PAGELEN}`, 50, toChangedFile);
 }
 //#endregion
 //#region src/util/format.ts
@@ -837,10 +944,16 @@ function formatDuration(seconds) {
 	if (m < 60) return `${m}m${String(s).padStart(2, "0")}s`;
 	return `${Math.floor(m / 60)}h${String(m % 60).padStart(2, "0")}m`;
 }
+const pad = (n) => String(n).padStart(2, "0");
+function formatDate$1(iso) {
+	const date = new Date(iso);
+	if (Number.isNaN(date.getTime())) return iso;
+	return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+}
 function formatDateTime(iso) {
 	const date = new Date(iso);
 	if (Number.isNaN(date.getTime())) return iso;
-	return date.toISOString().replace("T", " ").slice(0, 16);
+	return `${formatDate$1(iso)} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
 const MINUTE = 60;
 const HOUR = 3600;
@@ -859,134 +972,72 @@ function relativeTime(iso, nowMs) {
 	return `${Math.floor(days / 365)}y ago`;
 }
 //#endregion
-//#region src/util/link.ts
-const OSC8 = "\x1B]8;;";
-const BEL = "\x07";
-function hyperlink(text, url) {
-	if (!kleur.enabled || !url) return text;
-	return `${OSC8}${url}${BEL}${text}${OSC8}${BEL}`;
-}
-//#endregion
-//#region src/commands/search-run.ts
-function alignedRows(items, nowMs, cells) {
-	const rows = items.map((item) => {
-		const cell = cells(item);
-		return {
-			...cell,
-			age: relativeTime(cell.timestamp, nowMs),
-			json: { ...item }
-		};
-	});
-	const width = (pick) => Math.max(...rows.map((row) => pick(row).length));
-	const idWidth = width((row) => row.id);
-	const labelWidth = width((row) => row.label);
-	const ageWidth = width((row) => row.age);
-	return rows.map((row) => ({
-		id: row.id,
-		url: row.url,
-		fixedColumns: `${row.id.padEnd(idWidth)}  ${row.color(row.label.padEnd(labelWidth))}  ${row.age.padEnd(ageWidth)}`,
-		freeText: row.text,
-		json: row.json
-	}));
-}
-function formatRows(rows, options) {
-	if (rows.length === 0) return [options.empty];
-	const lines = rows.map((row) => formatRow(row, options.width));
-	return options.footer ? [...lines, options.footer] : lines;
-}
-function writeRows(term, rows, options) {
-	if (options.json) term.json(rows.map((r) => r.json));
-	else term.out(formatRows(rows, {
-		...options,
-		width: term.width
-	}));
-}
-const COPY_CONCURRENCY = 5;
-async function runSearch(term, rows, options, noun, copyOne) {
-	if (!(options.copy && !options.json && rows.length > 0)) {
-		writeRows(term, rows, options);
-		return;
-	}
-	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(term, rows, noun, copyOne);
-}
-function searchFooter(limit) {
-	return `
-Showing first ${limit}; refine with flags or raise --limit.`;
-}
-async function copySelected(term, rows, noun, copyOne) {
-	if (!term.interactive) throw new Error("--copy requires an interactive terminal.");
-	const selected = await term.ask.pickMany({
-		message: `Select ${noun.plural} to copy:`,
-		choices: rows.map((r) => ({
-			name: formatRow(r, term.width),
-			value: r.id
-		})),
-		pageSize: 20
-	});
-	if (selected.length === 0) {
-		term.out("Nothing selected.");
-		return;
+//#region src/commands/bitbucket-comments.ts
+const MENTION = /@\{([^}]+)\}/g;
+function renderedPrComments(comments, participants) {
+	const names = new Map(participants.map((person) => [person.accountId, person.name]));
+	return threadsOf(comments).map((thread) => renderThread(thread, names));
+}
+function threadsOf(comments) {
+	const byId = new Map(comments.map((comment) => [comment.id, comment]));
+	const threads = /* @__PURE__ */ new Map();
+	for (const comment of comments) {
+		const root = rootOf(comment, byId);
+		const thread = threads.get(root.id);
+		if (thread) thread.push(comment);
+		else threads.set(root.id, [comment]);
 	}
-	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)})`);
-		}
+	return [...threads.values()];
+}
+function rootOf(comment, byId) {
+	const seen = /* @__PURE__ */ new Set([comment.id]);
+	let current = comment;
+	while (current.parentId !== null) {
+		const parent = byId.get(current.parentId);
+		if (!parent || seen.has(parent.id)) break;
+		seen.add(parent.id);
+		current = parent;
 	}
-	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) term.out(summary);
-	else term.out(`${summary}, failed ${failures.length}: ${failures.join(", ")}`);
-}
-function formatRow(row, width) {
-	const room = width - stripVTControlCharacters(row.fixedColumns).length - 2;
-	const text = room > 0 ? truncate(row.freeText, room) : "";
-	const columns = hyperlink(row.id, row.url) + row.fixedColumns.slice(row.id.length);
-	return text ? `${columns}  ${hyperlink(text, row.url)}` : columns;
-}
-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/bitbucket.ts
-async function bitbucketPipelines({ session, term }, options) {
-	const ref = resolveRepo(options.repo, session);
-	const limit = parseLimit(options.limit);
-	writeRows(term, pipelineRows(await withScopeHint(PIPELINE_SCOPE, () => listPipelines(session, ref, limit)), Date.now()), {
-		json: options.json,
-		empty: "No pipelines found."
-	});
-}
-async function bitbucketPipeline({ session, term }, arg, options) {
-	const buildNumber = parseBuildNumber(arg);
-	const ref = resolveRepo(options.repo, session);
-	const detail = await withScopeHint(PIPELINE_SCOPE, () => getPipeline(session, ref, buildNumber));
-	const steps = await withScopeHint(PIPELINE_SCOPE, () => listSteps(session, ref, detail.uuid));
-	term.out(formatPipelineDetail(detail, steps, Date.now()));
-}
-function pipelineRows(pipelines, nowMs) {
-	return alignedRows(pipelines, nowMs, (p) => ({
-		id: `#${p.buildNumber}`,
-		url: p.url,
-		label: p.status || "-",
-		color: colorForBitbucketState(p.status),
-		text: `${refWithCommit(p)} · ${formatDuration(p.durationSeconds)}`,
-		timestamp: p.createdOn
+	return current;
+}
+function renderThread(thread, names) {
+	const rows = thread.map((comment, index) => ({
+		author: comment.author,
+		created: comment.created,
+		markdown: resolveMentions(comment.body, names),
+		...index === 0 ? { anchor: comment.anchor } : {}
 	}));
+	const trailer = resolvedTrailer(thread);
+	const last = rows.at(-1);
+	if (trailer && last) last.trailer = trailer;
+	return rows;
+}
+function resolvedTrailer(thread) {
+	const resolved = thread.find((comment) => comment.resolved)?.resolved;
+	if (!resolved) return "";
+	const by = resolved.by ? ` by ${resolved.by}` : "";
+	return kleur.green(`  ↳ resolved${by} · ${formatDateTime(resolved.at)}`);
+}
+function resolveMentions(body, names) {
+	return body.replace(MENTION, (raw, id) => {
+		const name = names.get(id);
+		return name ? `@${name}` : raw;
+	});
 }
+//#endregion
+//#region src/commands/bitbucket-shared.ts
+const PIPELINE_SCOPE = "read:pipeline:bitbucket";
+const PULL_REQUEST_SCOPE = "read:pullrequest:bitbucket";
+const REPOSITORY_SCOPE = "read:repository:bitbucket";
+const ACCOUNT_SCOPE = "read:account";
 const STATE_COLORS = {
 	SUCCESSFUL: kleur.green,
 	MERGED: kleur.green,
+	APPROVED: kleur.green,
 	FAILED: kleur.red,
 	ERROR: kleur.red,
 	DECLINED: kleur.red,
+	CHANGES_REQUESTED: kleur.red,
 	IN_PROGRESS: kleur.yellow,
 	PENDING: kleur.yellow,
 	OPEN: kleur.yellow,
@@ -998,454 +1049,869 @@ const STATE_COLORS = {
 function colorForBitbucketState(state) {
 	return STATE_COLORS[state.toUpperCase()] ?? kleur.white;
 }
-function formatStepRows(steps) {
-	const rows = steps.map((s) => ({
-		name: s.name || "-",
-		status: s.status || "-",
-		dur: formatDuration(s.durationSeconds)
-	}));
-	const wn = Math.max(...rows.map((r) => r.name.length));
-	const ws = Math.max(...rows.map((r) => r.status.length));
-	return rows.map((r) => `  ${r.name.padEnd(wn)}  ${r.status.padEnd(ws)}  ${r.dur}`);
-}
-function formatPipelineDetail(detail, steps, nowMs) {
-	const by = detail.creator ? ` by ${detail.creator}` : "";
-	return [
-		`Pipeline #${detail.buildNumber}  ${detail.status || "-"}`,
-		...detail.repo ? [`Repo:     ${detail.repo}`] : [],
-		`Ref:      ${refWithCommit(detail)}`,
-		...detail.trigger ? [`Trigger:  ${detail.trigger}`] : [],
-		`Duration: ${formatDuration(detail.durationSeconds)}`,
-		`Created:  ${relativeTime(detail.createdOn, nowMs)}${by}`,
-		...steps.length > 0 ? [
-			"",
-			"Steps:",
-			...formatStepRows(steps)
-		] : []
-	];
-}
-function refWithCommit(pipeline) {
-	if (!pipeline.ref) return pipeline.commit || "-";
-	return pipeline.commit ? `${pipeline.ref} (${pipeline.commit})` : pipeline.ref;
-}
-function parseBuildNumber(arg) {
-	const raw = (arg ?? "").replace(/^#/, "").trim();
-	if (!/^\d+$/.test(raw)) throw new Error(`Invalid pipeline number "${arg ?? ""}". Expected a build number, e.g. 123.`);
-	return Number.parseInt(raw, 10);
-}
-const PIPELINE_SCOPE = "read:pipeline:bitbucket";
 async function withScopeHint(scope, fn) {
 	try {
 		return await fn();
 	} catch (err) {
-		if (err instanceof HttpError && (err.status === 401 || err.status === 403)) throw new Error(`Bitbucket rejected the request (401/403). Check the token has the ${scope} scope, or run \`atlass bitbucket login\` to update it.`);
+		if (err instanceof HttpError && (err.status === 401 || err.status === 403)) throw new Error(`Bitbucket rejected ${err.path || "the request"} (401/403). Check the token has the ${scope} scope, or run \`atlass bitbucket login\` to update it.`);
 		throw err;
 	}
 }
 //#endregion
-//#region src/commands/bitbucket-prs.ts
-const PULL_REQUEST_SCOPE = "read:pullrequest:bitbucket";
-const ACCOUNT_SCOPE = "read:account";
-async function bitbucketPrs({ session, term, profile }, options) {
-	if (options.query && (options.author || options.reviewer)) throw new Error("--query cannot be combined with --author or --reviewer.");
-	const states = pullRequestStates(options);
-	const ref = resolveRepo(options.repo, session);
-	const limit = parseLimit(options.limit);
-	const query = pullRequestQuery({
-		...await resolvePrincipals(session, profile, options),
-		query: options.query
-	});
-	const prs = await withScopeHint(PULL_REQUEST_SCOPE, () => listPullRequests(session, ref, {
-		limit,
-		states,
-		query
-	}));
-	writeRows(term, pullRequestRows(prs, Date.now()), {
-		json: options.json,
-		empty: emptyMessage(options),
-		footer: prs.length === limit ? searchFooter(limit) : void 0
-	});
+//#region src/adf/to-markdown-inline.ts
+function renderMedia(node, ctx) {
+	const attrs = node.attrs ?? {};
+	const alt = attrs.alt ?? "";
+	const resolved = ctx.resolveMedia?.(attrs);
+	if (resolved) return `![${alt}](${resolved})`;
+	return `[embedded media: ${alt || attrs.id || "media"}]`;
 }
-function pullRequestStates(options) {
-	if (!options.all) return parsePullRequestStates(options.state);
-	if (options.state) throw new Error("--all cannot be combined with --state.");
-	return allPullRequestStates();
+function renderInline(nodes, ctx) {
+	return nodes.map((n) => renderInlineNode(n, ctx)).join("");
 }
-function pullRequestRows(prs, nowMs) {
-	return alignedRows(prs, nowMs, (pr) => {
-		const label = pr.draft ? "DRAFT" : pr.state || "-";
-		return {
-			id: `#${pr.id}`,
-			url: pr.url,
-			label,
-			color: colorForBitbucketState(label),
-			text: pr.title,
-			timestamp: pr.updatedOn
-		};
-	});
+function renderInlineNode(node, ctx) {
+	switch (node.type) {
+		case "text": return applyMarks(node.text ?? "", node.marks ?? []);
+		case "hardBreak": return "  \n";
+		case "mention": return (typeof node.attrs?.["text"] === "string" ? node.attrs["text"] : "") || "@unknown";
+		case "emoji": {
+			const text = node.attrs?.["text"];
+			if (typeof text === "string" && text.length > 0) return text;
+			const short = node.attrs?.["shortName"];
+			return typeof short === "string" ? short : "";
+		}
+		case "date": return formatDate(node.attrs?.["timestamp"]);
+		case "status": return `\`[${typeof node.attrs?.["text"] === "string" ? node.attrs["text"] : ""}]\``;
+		case "inlineCard": {
+			const url = node.attrs?.["url"];
+			if (typeof url === "string") return `[${url}](${url})`;
+			return "";
+		}
+		case "media": return renderMedia(node, ctx);
+		default: return node.text ?? "";
+	}
 }
-async function resolvePrincipals(session, profile, options) {
-	const mine = isMe(options.author) || isMe(options.reviewer) ? await currentUuid(session, profile) : void 0;
-	return {
-		author: isMe(options.author) ? mine : options.author,
-		reviewer: isMe(options.reviewer) ? mine : options.reviewer
-	};
+function applyMarks(text, marks) {
+	if (text.length === 0) return text;
+	let out = text;
+	let href;
+	for (const mark of marks) switch (mark.type) {
+		case "code":
+			out = `\`${out}\``;
+			break;
+		case "strong":
+			out = `**${out}**`;
+			break;
+		case "em":
+			out = `*${out}*`;
+			break;
+		case "strike":
+			out = `~~${out}~~`;
+			break;
+		case "link": {
+			const value = mark.attrs?.["href"];
+			if (typeof value === "string") href = value;
+			break;
+		}
+	}
+	if (href) out = `[${out}](${href})`;
+	return out;
 }
-function isMe(value) {
-	return value?.toLowerCase() === "me";
+function formatDate(timestamp) {
+	const ms = typeof timestamp === "string" ? Number(timestamp) : typeof timestamp === "number" ? timestamp : NaN;
+	if (Number.isNaN(ms)) return "";
+	return new Date(ms).toISOString().slice(0, 10);
 }
-async function currentUuid(session, profile) {
-	if (session.uuid) return session.uuid;
-	const uuid = await withScopeHint(ACCOUNT_SCOPE, () => fetchCurrentUserUuid(session));
-	await rememberBitbucketUuid(profile, uuid);
-	return uuid;
+//#endregion
+//#region src/adf/to-markdown.ts
+function adfToMarkdown(doc, options = {}) {
+	if (!doc) return "";
+	const ctx = { resolveMedia: options.resolveMedia };
+	return (doc.type === "doc" ? renderBlocks(doc.content ?? [], ctx, "") : renderBlock(doc, ctx, "")).trim();
 }
-function emptyMessage(options) {
-	return options.author || options.reviewer || options.query || options.state || options.all ? "No matching pull requests." : "No open pull requests.";
+function renderBlocks(nodes, ctx, indent) {
+	return nodes.map((n) => renderBlock(n, ctx, indent)).filter((s) => s.length > 0).join("\n\n");
 }
-//#endregion
-//#region src/cli/bitbucket.ts
-function registerBitbucket(bitbucket) {
-	bitbucket.description("Bitbucket commands");
-	bitbucket.command("login").description("Store Bitbucket workspace and API token").action(bareAction(bitbucketLogin));
-	bitbucket.command("logout").description("Remove stored Bitbucket credentials").action(bareAction(bitbucketLogout));
-	bitbucket.command("status").description("Show the current Bitbucket login").action(bareAction(bitbucketStatus));
-	bitbucket.command("pipelines").description("List recent pipeline runs for a repo").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").action(bitbucketAction(bitbucketPipelines));
-	bitbucket.command("prs").description("List pull requests for a repo").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").option("-s, --state <state...>", "open, merged, declined, or superseded").option("--all", "include every state").option("-a, --author <who>", "limit to an author ('me', an account id, or a uuid)").option("--reviewer <who>", "limit to a reviewer ('me', an account id, or a uuid)").option("-q, --query <bbql>", "raw Bitbucket query (not for use with --author or --reviewer)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").action(bitbucketAction(bitbucketPrs));
-	bitbucket.command("pipeline <number>").description("Show one pipeline run and its steps").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").action(bitbucketAction(bitbucketPipeline));
-	return bitbucket;
+function renderBlock(node, ctx, indent) {
+	switch (node.type) {
+		case "paragraph": return indent + renderInline(node.content ?? [], ctx);
+		case "heading": {
+			const level = clampLevel$1(node.attrs?.["level"]);
+			return `${"#".repeat(level)} ${renderInline(node.content ?? [], ctx)}`;
+		}
+		case "bulletList": return renderList(node, ctx, indent, "bullet");
+		case "orderedList": return renderList(node, ctx, indent, "ordered");
+		case "taskList": return renderTaskList(node, ctx, indent);
+		case "decisionList": return renderDecisionList(node, ctx, indent);
+		case "codeBlock": return renderCodeBlock(node, indent);
+		case "blockquote": return prefixLines(renderBlocks(node.content ?? [], ctx, ""), `${indent}> `);
+		case "panel": return renderPanel(node, ctx, indent);
+		case "rule": return `${indent}---`;
+		case "table": return renderTable(node, ctx);
+		case "mediaSingle":
+		case "mediaGroup": return renderBlocks(node.content ?? [], ctx, indent);
+		case "media": return indent + renderMedia(node, ctx);
+		case "expand":
+		case "nestedExpand": return renderExpand(node, ctx, indent);
+		default:
+			if (node.content?.length) return renderBlocks(node.content, ctx, indent);
+			return node.text ? indent + node.text : "";
+	}
 }
-//#endregion
-//#region src/adf/from-markdown.ts
-function mediaNode(source, alt) {
-	const attrs = { ...source };
-	if (alt) attrs["alt"] = alt;
-	return {
-		type: "mediaSingle",
-		attrs: { layout: "center" },
-		content: [{
-			type: "media",
-			attrs
-		}]
-	};
+function renderList(node, ctx, indent, kind) {
+	const start = kind === "ordered" ? toNumber(node.attrs?.["order"]) ?? 1 : 0;
+	return (node.content ?? []).filter((n) => n.type === "listItem").map((item, i) => {
+		return renderListItem(item, ctx, indent, kind === "ordered" ? `${start + i}. ` : "- ");
+	}).join("\n");
 }
-function imageHrefs(md) {
-	const hrefs = /* @__PURE__ */ new Set();
-	marked.walkTokens(marked.lexer(md), (token) => {
-		if (token.type === "image") hrefs.add(token.href);
-	});
-	return [...hrefs];
+function renderListItem(item, ctx, indent, marker) {
+	const continuationIndent = `${indent}${" ".repeat(marker.length)}`;
+	return (item.content ?? []).map((block, i) => i === 0 ? `${indent}${marker}${renderBlock(block, ctx, "")}` : renderBlock(block, ctx, continuationIndent)).join("\n");
 }
-function markdownToAdf(md, options = {}) {
-	const ctx = { resolveImage: options.resolveImage ?? externalMedia };
-	return {
-		type: "doc",
-		version: 1,
-		content: blocks(marked.lexer(md), ctx)
-	};
+function renderTaskList(node, ctx, indent) {
+	return (node.content ?? []).filter((n) => n.type === "taskItem").map((item) => {
+		return `${indent}- [${item.attrs?.["state"] === "DONE" ? "x" : " "}] ${renderInline(item.content ?? [], ctx)}`;
+	}).join("\n");
 }
-function blocks(tokens, ctx) {
-	const out = [];
-	for (const token of tokens) out.push(...block(token, ctx));
-	return out;
+function renderDecisionList(node, ctx, indent) {
+	return (node.content ?? []).filter((n) => n.type === "decisionItem").map((item) => `${indent}- (decision) ${renderInline(item.content ?? [], ctx)}`).join("\n");
 }
-function block(token, ctx) {
-	switch (token.type) {
-		case "space": return [];
-		case "heading": return [{
-			type: "heading",
-			attrs: { level: clampLevel$1(token.depth) },
-			content: inline(token.tokens ?? [], ctx)
-		}];
-		case "paragraph": return paragraphsSplitAtImages(token.tokens ?? [], ctx);
-		case "text": return paragraphsSplitAtImages(token.tokens ?? [textToken(token.text)], ctx);
-		case "list": return [list(token, ctx)];
-		case "code": return [codeBlock(token)];
-		case "blockquote": return [{
-			type: "blockquote",
-			content: blocks(token.tokens ?? [], ctx)
-		}];
-		case "table": return [table(token, ctx)];
-		case "hr": return [{ type: "rule" }];
-		default: return [];
-	}
+function renderCodeBlock(node, indent) {
+	const lang = typeof node.attrs?.["language"] === "string" ? node.attrs["language"] : "";
+	const code = (node.content ?? []).map((n) => n.text ?? "").join("");
+	const fence = "```";
+	return prefixLines(`${fence}${lang}\n${code}\n${fence}`, indent);
 }
-function paragraphsSplitAtImages(tokens, ctx) {
-	const out = [];
-	let buffer = [];
-	const flush = () => {
-		if (buffer.length === 0) return;
-		const nodes = inline(buffer, ctx);
-		if (nodes.length > 0) out.push({
-			type: "paragraph",
-			content: nodes
-		});
-		buffer = [];
-	};
-	for (const token of tokens) if (token.type === "image") {
-		flush();
-		const image = token;
-		const node = ctx.resolveImage(image.href, image.text ?? "");
-		if (node) out.push(node);
-	} else buffer.push(token);
-	flush();
-	return out;
+const PANEL_LABELS = {
+	info: "Info",
+	note: "Note",
+	warning: "Warning",
+	success: "Success",
+	error: "Error"
+};
+function renderPanel(node, ctx, indent) {
+	const type = typeof node.attrs?.["panelType"] === "string" ? node.attrs["panelType"] : "info";
+	return prefixLines(`**${PANEL_LABELS[type] ?? "Note"}**\n\n${renderBlocks(node.content ?? [], ctx, "")}`, `${indent}> `);
 }
-function list(token, ctx) {
-	if (token.items.length > 0 && token.items.every((i) => i.task)) return {
-		type: "taskList",
-		attrs: { localId: randomUUID() },
-		content: token.items.map((item) => ({
-			type: "taskItem",
-			attrs: {
-				localId: randomUUID(),
-				state: item.checked ? "DONE" : "TODO"
-			},
-			content: inline(taskItemInline(item), ctx)
-		}))
+function renderExpand(node, ctx, indent) {
+	return `${indent}<details><summary>${typeof node.attrs?.["title"] === "string" ? node.attrs["title"] : "Details"}</summary>\n\n${renderBlocks(node.content ?? [], ctx, "")}\n\n${indent}</details>`;
+}
+function renderTable(node, ctx) {
+	const rows = (node.content ?? []).filter((n) => n.type === "tableRow");
+	if (rows.length === 0) return "";
+	const grid = rows.map((row) => (row.content ?? []).map((cell) => renderCellOnOneLine(cell, ctx)));
+	const cols = Math.max(...grid.map((r) => r.length));
+	const pad = (r) => {
+		const copy = [...r];
+		while (copy.length < cols) copy.push("");
+		return copy;
 	};
-	const node = {
-		type: token.ordered ? "orderedList" : "bulletList",
-		content: token.items.map((item) => listItem(item, ctx))
+	const header = pad(grid[0] ?? []);
+	const lines = [`| ${header.join(" | ")} |`, `| ${header.map(() => "---").join(" | ")} |`];
+	for (const row of grid.slice(1)) lines.push(`| ${pad(row).join(" | ")} |`);
+	return lines.join("\n");
+}
+function renderCellOnOneLine(cell, ctx) {
+	return renderBlocks(cell.content ?? [], ctx, "").replace(/\n+/g, " ").replace(/\|/g, "\\|").trim();
+}
+function prefixLines(text, prefix) {
+	return text.split("\n").map((line) => line.length > 0 ? prefix + line : prefix.trimEnd()).join("\n");
+}
+function clampLevel$1(value) {
+	const n = toNumber(value) ?? 1;
+	return Math.min(6, Math.max(1, n));
+}
+function toNumber(value) {
+	return typeof value === "number" ? value : void 0;
+}
+//#endregion
+//#region src/markdown/highlight.ts
+const HEADING = /^#{1,6} /;
+const QUOTE = /^(\s*)>( |$)/;
+const LIST = /^(\s*)(-|\d+\.) (\[[ x]\] )?/;
+const RULE = /^\s*---$/;
+const TABLE_ROW = /^\|.*\|$/;
+const TABLE_SEPARATOR = /^\|( --- \|)+$/;
+const CELL_DIVIDER = /(?<!\\)\|/;
+const DETAILS_OPEN = /^(\s*)<details><summary>(.*)<\/summary>$/;
+const DETAILS_CLOSE = /^\s*<\/details>$/;
+const FENCE_OPEN = /^((?:\s|> |- |\d+\. )*)```(\S*)$/;
+const FENCE = "```";
+const INLINE = /(`[^`]+`)|\[([^\]]+)\]\(((?:[^()]|\([^()]*\))+)\)|\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(?!\*)(.+?)(?<!\*)\*(?!\*)|~~(.+?)~~/g;
+const TOKEN_STYLES = {
+	keyword: kleur.magenta,
+	built_in: kleur.magenta,
+	literal: kleur.magenta,
+	string: kleur.green,
+	regexp: kleur.green,
+	addition: kleur.green,
+	number: kleur.yellow,
+	symbol: kleur.yellow,
+	meta: kleur.yellow,
+	attr: kleur.yellow,
+	comment: kleur.dim,
+	quote: kleur.dim,
+	deletion: kleur.dim,
+	title: kleur.cyan,
+	type: kleur.cyan,
+	section: kleur.cyan
+};
+const lowlight = createLowlight(common);
+function highlightMarkdown(md) {
+	const lines = md.split("\n");
+	const out = [];
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i] ?? "";
+		const fence = line.match(FENCE_OPEN);
+		if (!fence) {
+			out.push(highlightLine(line, lines[i + 1]));
+			continue;
+		}
+		const [, prefix = "", lang = ""] = fence;
+		const styledPrefix = prefix.replace(/\S+/g, (marker) => kleur.dim(marker));
+		out.push(`${styledPrefix}${kleur.dim(`${FENCE}${lang}`)}`);
+		const code = [];
+		const prefixed = [];
+		let j = i + 1;
+		for (; j < lines.length; j++) {
+			const raw = lines[j] ?? "";
+			const hasPrefix = raw.startsWith(prefix) || raw === prefix.trimEnd();
+			const body = raw.startsWith(prefix) ? raw.slice(prefix.length) : hasPrefix ? "" : raw;
+			if (body === FENCE) break;
+			code.push(body);
+			prefixed.push(hasPrefix);
+		}
+		if (code.length > 0) highlightCode(code.join("\n"), lang).split("\n").forEach((codeLine, k) => {
+			const lead = prefixed[k] ? styledPrefix : "";
+			out.push(codeLine ? `${lead}${codeLine}` : lead.trimEnd());
+		});
+		if (j < lines.length) {
+			const lead = (lines[j] ?? "").startsWith(prefix) ? styledPrefix : "";
+			out.push(`${lead}${kleur.dim(FENCE)}`);
+		}
+		i = j;
+	}
+	return out.join("\n");
+}
+function highlightCode(code, lang) {
+	if (!lang || !lowlight.registered(lang)) return styleEachLine(code, kleur.yellow);
+	return renderTree(lowlight.highlight(lang, code), (text) => text);
+}
+function renderTree(node, style) {
+	if (node.type === "text") return styleEachLine(node.value, style);
+	if (node.type !== "root" && node.type !== "element") return "";
+	const own = node.type === "element" ? tokenStyle(node.properties["className"]) : void 0;
+	const next = own ? (text) => style(own(text)) : style;
+	return node.children.map((child) => renderTree(child, next)).join("");
+}
+function tokenStyle(className) {
+	if (!Array.isArray(className)) return void 0;
+	for (const name of className) {
+		if (typeof name !== "string" || !name.startsWith("hljs-")) continue;
+		const style = TOKEN_STYLES[name.slice(5)];
+		if (style) return style;
+	}
+}
+function styleEachLine(text, style) {
+	return text.split("\n").map((line) => line ? style(line) : line).join("\n");
+}
+function highlightLine(line, nextLine) {
+	const quote = line.match(QUOTE);
+	if (quote) {
+		const [whole, indent = ""] = quote;
+		const rest = line.slice(whole.length);
+		const gap = whole.endsWith(" ") ? " " : "";
+		return `${indent}${kleur.dim(">")}${gap}${highlightLine(rest, stripPrefix(nextLine, whole))}`;
+	}
+	const list = line.match(LIST);
+	if (list) {
+		const [whole, indent = "", marker = "", checkbox] = list;
+		const rest = line.slice(whole.length);
+		const box = checkbox ? `${kleur.bold(checkbox.trim())} ` : "";
+		return `${indent}${kleur.dim(marker)} ${box}${highlightLine(rest, void 0)}`;
+	}
+	if (HEADING.test(line)) return kleur.bold().cyan(line);
+	if (RULE.test(line)) return kleur.dim(line);
+	if (TABLE_SEPARATOR.test(line)) return kleur.dim(line);
+	if (TABLE_ROW.test(line)) return tableRow(line, nextLine !== void 0 && TABLE_SEPARATOR.test(nextLine));
+	const details = line.match(DETAILS_OPEN);
+	if (details) {
+		const [, indent = "", title = ""] = details;
+		return `${indent}${kleur.dim("<details><summary>")}${highlightInline(title)}${kleur.dim("</summary>")}`;
+	}
+	if (DETAILS_CLOSE.test(line)) return kleur.dim(line);
+	return highlightInline(line);
+}
+function stripPrefix(line, prefix) {
+	return line?.startsWith(prefix) ? line.slice(prefix.length) : void 0;
+}
+function tableRow(line, header) {
+	const styled = line.split(CELL_DIVIDER).slice(1, -1).map((cell) => header ? kleur.bold(highlightInline(cell)) : highlightInline(cell));
+	const pipe = kleur.dim("|");
+	return `${pipe}${styled.join(pipe)}${pipe}`;
+}
+function highlightInline(text) {
+	return text.replace(INLINE, (match, code, linkText, url, boldItalic, bold, italic, strike) => {
+		if (code !== void 0) return kleur.yellow(code);
+		if (linkText !== void 0 && url !== void 0) return link(linkText, url);
+		if (boldItalic !== void 0) return kleur.bold().italic(match);
+		if (bold !== void 0) return kleur.bold(`**${highlightInline(bold)}**`);
+		if (italic !== void 0) return kleur.italic(`*${highlightInline(italic)}*`);
+		if (strike !== void 0) return kleur.strikethrough(`~~${highlightInline(strike)}~~`);
+		return match;
+	});
+}
+function link(text, url) {
+	const open = kleur.dim("[");
+	const middle = kleur.dim("](");
+	return `${open}${highlightInline(text)}${middle}${kleur.dim().underline(url)}${kleur.dim(")")}`;
+}
+//#endregion
+//#region src/commands/view.ts
+const INDENT = "  ";
+function fieldLines(pairs) {
+	const kept = pairs.filter(([, value]) => value !== "");
+	const width = Math.max(...kept.map(([label]) => label.length)) + 1;
+	return kept.map(([label, value]) => `${kleur.dim(`${label}:`.padEnd(width))}  ${value}`);
+}
+function dateWithAge(iso, nowMs) {
+	if (!iso) return "";
+	return `${formatDate$1(iso)} (${relativeTime(iso, nowMs)})`;
+}
+function markdownBody(md) {
+	return md ? ["", highlightMarkdown(md)] : [];
+}
+function bodyLines(body) {
+	return markdownBody(adfToMarkdown(body));
+}
+function renderedComments(comments) {
+	return comments.map((comment) => [{
+		author: comment.author,
+		created: comment.created,
+		markdown: adfToMarkdown(comment.body)
+	}]);
+}
+function commentSection(threads, options) {
+	const total = threads.reduce((running, thread) => running + thread.length, 0);
+	if (total === 0) return [];
+	const visible = options.allComments ? threads : threads.slice(-5);
+	const lines = ["", kleur.bold(commentHeading(total, threads.length, visible.length, options))];
+	for (const thread of visible) thread.forEach((comment, index) => {
+		lines.push("", commentHeader(comment, index > 0), ...commentBody(comment, index > 0), ...commentTrailer(comment));
+	});
+	return lines;
+}
+function commentHeading(total, threads, visible, options) {
+	const count = options.truncated ? `${total}+` : String(total);
+	if (visible === threads) return `Comments (${count})`;
+	if (threads === total) return `Comments (${count}, showing last ${visible} — --all-comments for all)`;
+	return `Comments (${count} in ${threads} threads, showing last ${visible} threads — --all-comments for all)`;
+}
+function commentHeader(comment, reply) {
+	const author = kleur.bold(comment.author || "Unknown");
+	const when = comment.created ? ` · ${kleur.dim(formatDateTime(comment.created))}` : "";
+	const where = comment.anchor ? ` · ${kleur.dim(comment.anchor)}` : "";
+	return `${reply ? `${INDENT}↳ ` : "─ "}${author}${when}${where}`;
+}
+function commentBody(comment, reply) {
+	if (!comment.markdown) return [];
+	const body = highlightMarkdown(comment.markdown);
+	if (!reply) return [body];
+	return [body.split("\n").map((line) => line ? `${INDENT}${line}` : line).join("\n")];
+}
+function commentTrailer(comment) {
+	return comment.trailer ? ["", comment.trailer] : [];
+}
+function attachmentSection(attachments) {
+	if (attachments.length === 0) return [];
+	return [
+		"",
+		kleur.bold("Attachments"),
+		...attachments.map((a) => `- ${a.filename}`)
+	];
+}
+//#endregion
+//#region src/commands/bitbucket-pr.ts
+async function bitbucketPr({ session, term }, arg, options) {
+	const ref = parseRef(arg);
+	const repo = ref.repo ?? resolveRepo(options.repo, session);
+	const detail = await withScopeHint(PULL_REQUEST_SCOPE, () => fetchDetail(session, repo, ref.id));
+	const [comments, files] = await Promise.all([withScopeHint(PULL_REQUEST_SCOPE, () => listComments(session, repo, ref.id)), fetchFiles(session, repo, ref.id)]);
+	if (options.json) {
+		term.json({
+			...detail,
+			comments: comments.items,
+			files: files?.items ?? null,
+			truncated: {
+				comments: comments.truncated,
+				files: files?.truncated ?? false
+			}
+		});
+		return;
+	}
+	const lines = formatPullRequestView(detail, comments, files, Date.now(), options.allComments);
+	await term.page(lines.join("\n"), { pager: options.pager });
+}
+function formatPullRequestView(detail, comments, files, nowMs, allComments = false) {
+	const label = detail.draft ? "DRAFT" : detail.state || "-";
+	return [
+		kleur.bold(detail.title),
+		...fieldLines([
+			["State", colorForBitbucketState(label)(label)],
+			["Author", detail.author],
+			["Branch", branchLine(detail)],
+			["Approvals", approvalCount(detail.reviewers)],
+			["Created", dateWithAge(detail.createdOn, nowMs)],
+			["Updated", dateWithAge(detail.updatedOn, nowMs)],
+			["Closed by", detail.closedBy],
+			["URL", detail.url]
+		]),
+		...markdownBody(detail.description),
+		...reviewerSection(detail.reviewers),
+		...fileSection(files),
+		...commentSection(renderedPrComments(comments.items, detail.participants), {
+			allComments,
+			truncated: comments.truncated
+		})
+	];
+}
+function reviewerSection(reviewers) {
+	const heading = ["", kleur.bold("Reviewers")];
+	if (reviewers.length === 0) return [...heading, `  ${kleur.dim("None assigned")}`];
+	const width = Math.max(...reviewers.map((r) => r.name.length));
+	return [...heading, ...reviewers.map((r) => `  ${r.name.padEnd(width)}  ${reviewerState(r)}`)];
+}
+function fileSection(files) {
+	if (!files) return [
+		"",
+		kleur.bold("Files"),
+		`  ${kleur.dim(`Unavailable: the token needs the ${REPOSITORY_SCOPE} scope.`)}`
+	];
+	if (files.items.length === 0) return [];
+	const rows = files.items.map((file) => ({
+		added: `+${file.added}`,
+		removed: `-${file.removed}`,
+		path: file.path
+	}));
+	const wa = Math.max(...rows.map((r) => r.added.length));
+	const wr = Math.max(...rows.map((r) => r.removed.length));
+	const total = files.total ?? files.items.length;
+	const added = sum(files.items, (f) => f.added);
+	const removed = sum(files.items, (f) => f.removed);
+	return [
+		"",
+		kleur.bold(`Files (${total}, +${added} -${removed})`),
+		...rows.map((r) => `  ${kleur.green(r.added.padStart(wa))}  ${kleur.red(r.removed.padStart(wr))}  ${r.path}`),
+		...moreFilesLine(files)
+	];
+}
+function moreFilesLine(files) {
+	if (!files.truncated) return [];
+	const rest = files.total === void 0 ? void 0 : files.total - files.items.length;
+	return [kleur.dim(rest === void 0 ? "  ... more files not shown" : `  ... and ${rest} more`)];
+}
+function sum(files, pick) {
+	return files.reduce((running, file) => running + pick(file), 0);
+}
+function reviewerState(reviewer) {
+	if (!reviewer.state) return kleur.dim("—");
+	return colorForBitbucketState(reviewer.state)(reviewer.state);
+}
+function approvalCount(reviewers) {
+	return `${reviewers.filter((r) => r.state === "APPROVED").length}/${reviewers.length}`;
+}
+function branchLine(detail) {
+	if (!detail.sourceBranch || !detail.destinationBranch) return detail.sourceBranch || detail.destinationBranch;
+	return `${detail.sourceBranch} → ${detail.destinationBranch}`;
+}
+function parseRef(arg) {
+	const ref = parsePullRequestRef(arg ?? "");
+	if (!ref) throw new Error(`Invalid pull request "${arg ?? ""}". Expected a PR number, e.g. 42, or a Bitbucket pull request URL.`);
+	return ref;
+}
+async function fetchFiles(session, repo, id) {
+	try {
+		return await listChangedFiles(session, repo, id);
+	} catch (err) {
+		if (err instanceof HttpError && (err.status === 401 || err.status === 403)) return null;
+		throw err;
+	}
+}
+async function fetchDetail(session, repo, id) {
+	try {
+		return await getPullRequest(session, repo, id);
+	} catch (err) {
+		if (err instanceof HttpError && err.status === 404) throw new Error(`Pull request #${id} not found in ${repo.workspace}/${repo.repo}.`);
+		throw err;
+	}
+}
+//#endregion
+//#region src/util/link.ts
+const OSC8 = "\x1B]8;;";
+const BEL = "\x07";
+function hyperlink(text, url) {
+	if (!kleur.enabled || !url) return text;
+	return `${OSC8}${url}${BEL}${text}${OSC8}${BEL}`;
+}
+//#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);
+		return {
+			...cell,
+			age: relativeTime(cell.timestamp, nowMs),
+			json: { ...item }
+		};
+	});
+	const width = (pick) => Math.max(...rows.map((row) => pick(row).length));
+	const idWidth = width((row) => row.id);
+	const labelWidth = width((row) => row.label);
+	const ageWidth = width((row) => row.age);
+	return rows.map((row) => ({
+		id: row.id,
+		url: row.url,
+		fixedColumns: `${row.id.padEnd(idWidth)}  ${row.color(row.label.padEnd(labelWidth))}  ${row.age.padEnd(ageWidth)}`,
+		freeText: row.text,
+		json: row.json
+	}));
+}
+function formatRows(rows, options) {
+	if (rows.length === 0) return [options.empty];
+	const lines = rows.map((row) => formatRow(row, options.width));
+	return options.footer ? [...lines, options.footer] : lines;
+}
+function writeRows(term, rows, options) {
+	if (options.json) term.json(rows.map((r) => r.json));
+	else term.out(formatRows(rows, {
+		...options,
+		width: term.width
+	}));
+}
+const COPY_CONCURRENCY = 5;
+async function runSearch(term, rows, options, noun, copyOne) {
+	if (!(options.copy && !options.json && rows.length > 0)) {
+		writeRows(term, rows, options);
+		return;
+	}
+	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(term, rows, noun, copyOne);
+}
+function searchFooter(limit) {
+	return `
+Showing first ${limit}; refine with flags or raise --limit.`;
+}
+async function copySelected(term, rows, noun, copyOne) {
+	if (!term.interactive) throw new Error("--copy requires an interactive terminal.");
+	const selected = await term.ask.pickMany({
+		message: `Select ${noun.plural} to copy:`,
+		choices: rows.map((r) => ({
+			name: formatRow(r, term.width),
+			value: r.id
+		})),
+		pageSize: 20
+	});
+	if (selected.length === 0) {
+		term.out("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) term.out(summary);
+	else term.out(`${summary}, failed ${failures.length}: ${failures.join(", ")}`);
+}
+function formatRow(row, width) {
+	const room = width - stripVTControlCharacters(row.fixedColumns).length - 2;
+	const text = room > 0 ? truncate(row.freeText, room) : "";
+	const columns = hyperlink(row.id, row.url) + row.fixedColumns.slice(row.id.length);
+	return text ? `${columns}  ${hyperlink(text, row.url)}` : columns;
+}
+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/bitbucket-prs.ts
+async function bitbucketPrs({ session, term, profile }, options) {
+	if (options.query && (options.author || options.reviewer)) throw new Error("--query cannot be combined with --author or --reviewer.");
+	const states = pullRequestStates(options);
+	const ref = resolveRepo(options.repo, session);
+	const limit = parseLimit(options.limit);
+	const query = pullRequestQuery({
+		...await resolvePrincipals(session, profile, options),
+		query: options.query
+	});
+	const prs = await withScopeHint(PULL_REQUEST_SCOPE, () => listPullRequests(session, ref, {
+		limit,
+		states,
+		query
+	}));
+	writeRows(term, pullRequestRows(prs, Date.now()), {
+		json: options.json,
+		empty: emptyMessage(options),
+		footer: prs.length === limit ? searchFooter(limit) : void 0
+	});
+}
+function pullRequestStates(options) {
+	if (!options.all) return parsePullRequestStates(options.state);
+	if (options.state) throw new Error("--all cannot be combined with --state.");
+	return allPullRequestStates();
+}
+function pullRequestRows(prs, nowMs) {
+	return alignedRows(prs, nowMs, (pr) => {
+		const label = pr.draft ? "DRAFT" : pr.state || "-";
+		return {
+			id: `#${pr.id}`,
+			url: pr.url,
+			label,
+			color: colorForBitbucketState(label),
+			text: pr.title,
+			timestamp: pr.updatedOn
+		};
+	});
+}
+async function resolvePrincipals(session, profile, options) {
+	const mine = isMe(options.author) || isMe(options.reviewer) ? await currentUuid(session, profile) : void 0;
+	return {
+		author: isMe(options.author) ? mine : options.author,
+		reviewer: isMe(options.reviewer) ? mine : options.reviewer
 	};
-	const start = Number(token.start);
-	if (token.ordered && Number.isFinite(start) && start !== 1) node.attrs = { order: start };
-	return node;
 }
-function listItem(item, ctx) {
-	const children = blocks(item.tokens.filter((t) => t.type !== "checkbox"), ctx);
-	return {
-		type: "listItem",
-		content: children.length > 0 ? children : [emptyParagraph()]
-	};
+function isMe(value) {
+	return value?.toLowerCase() === "me";
+}
+async function currentUuid(session, profile) {
+	if (session.uuid) return session.uuid;
+	const uuid = await withScopeHint(ACCOUNT_SCOPE, () => fetchCurrentUserUuid(session));
+	await rememberBitbucketUuid(profile, uuid);
+	return uuid;
+}
+function emptyMessage(options) {
+	return options.author || options.reviewer || options.query || options.state || options.all ? "No matching pull requests." : "No open pull requests.";
+}
+//#endregion
+//#region src/api/bitbucket-pipelines.ts
+const BUILD_NUMBER_SCAN_LIMIT = 1e3;
+function pipelineStatus(state) {
+	if (!state) return "";
+	if (state.name === "COMPLETED") return state.result?.name ?? "COMPLETED";
+	return state.name ?? "";
+}
+function pipelinesQuery(limit) {
+	return new URLSearchParams({
+		sort: "-created_on",
+		pagelen: String(Math.min(Math.max(limit, 1), 100))
+	}).toString();
 }
-function emptyParagraph() {
-	return {
-		type: "paragraph",
-		content: []
-	};
+function wallClockSeconds(startOn, endOn) {
+	if (!startOn || !endOn) return null;
+	const start = Date.parse(startOn);
+	const end = Date.parse(endOn);
+	if (Number.isNaN(start) || Number.isNaN(end)) return null;
+	return Math.floor((end - start) / 1e3);
 }
-function taskItemInline(item) {
-	const first = item.tokens.find((t) => t.type === "text");
-	if (first && "tokens" in first && first.tokens) return first.tokens;
-	return [textToken(item.text)];
+function shortHash(hash) {
+	return hash?.slice(0, 7) ?? "";
 }
-function codeBlock(token) {
+function pipelineUrl(ref, buildNumber) {
+	return `${BITBUCKET_WEB_ORIGIN}/${ref.workspace}/${ref.repo}/pipelines/results/${buildNumber}`;
+}
+function toPipelineSummary(ref, p) {
 	return {
-		type: "codeBlock",
-		attrs: token.lang ? { language: token.lang } : {},
-		content: token.text.length > 0 ? [{
-			type: "text",
-			text: token.text
-		}] : []
+		buildNumber: p.build_number,
+		status: pipelineStatus(p.state),
+		ref: p.target?.ref_name ?? "",
+		commit: shortHash(p.target?.commit?.hash),
+		durationSeconds: wallClockSeconds(p.created_on, p.completed_on),
+		createdOn: p.created_on ?? "",
+		creator: p.creator?.display_name ?? "",
+		uuid: p.uuid,
+		url: pipelineUrl(ref, p.build_number)
 	};
 }
-function table(token, ctx) {
+function toPipelineDetail(ref, p) {
 	return {
-		type: "table",
-		content: [{
-			type: "tableRow",
-			content: token.header.map((cell) => tableCell(cell, "tableHeader", ctx))
-		}, ...token.rows.map((row) => ({
-			type: "tableRow",
-			content: row.map((cell) => tableCell(cell, "tableCell", ctx))
-		}))]
+		...toPipelineSummary(ref, p),
+		repo: p.repository?.full_name ?? "",
+		trigger: p.trigger?.name ?? ""
 	};
 }
-function tableCell(cell, type, ctx) {
+function toStepSummary(step) {
 	return {
-		type,
-		content: [{
-			type: "paragraph",
-			content: inline(cell.tokens, ctx)
-		}]
+		name: step.name ?? "",
+		status: pipelineStatus(step.state),
+		durationSeconds: wallClockSeconds(step.started_on, step.completed_on)
 	};
 }
-function inline(tokens, ctx, marks = []) {
-	const out = [];
-	for (const token of tokens) out.push(...inlineNode(token, ctx, marks));
-	return out;
-}
-function inlineNode(token, ctx, marks) {
-	switch (token.type) {
-		case "text":
-		case "escape": {
-			const t = token;
-			if ("tokens" in t && t.tokens?.length) return inline(t.tokens, ctx, marks);
-			return textNode(t.text, marks);
-		}
-		case "strong": return inline(token.tokens, ctx, withUniqueMark(marks, { type: "strong" }));
-		case "em": return inline(token.tokens, ctx, withUniqueMark(marks, { type: "em" }));
-		case "del": return inline(token.tokens, ctx, withUniqueMark(marks, { type: "strike" }));
-		case "codespan": return textNode(token.text, withUniqueMark(marks, { type: "code" }));
-		case "link": {
-			const link = token;
-			return inline(link.tokens, ctx, withUniqueMark(marks, {
-				type: "link",
-				attrs: { href: link.href }
-			}));
-		}
-		case "br": return [{ type: "hardBreak" }];
-		case "html": return textNode(token.text, marks);
-		default: return "text" in token && token.text ? textNode(token.text, marks) : [];
-	}
+function pipelinesPath(ref) {
+	return repoPath(ref, "pipelines");
 }
-function textNode(text, marks) {
-	if (text.length === 0) return [];
-	const node = {
-		type: "text",
-		text
-	};
-	if (marks.length > 0) node.marks = marks;
-	return [node];
+async function listPipelines(client, ref, limit) {
+	return collectPages(client, `${pipelinesPath(ref)}?${pipelinesQuery(limit)}`, limit, (value) => toPipelineSummary(ref, value));
 }
-function withUniqueMark(marks, mark) {
-	return [...marks.filter((m) => m.type !== mark.type), mark];
+async function getPipeline(client, ref, buildNumber) {
+	const found = await fetchByBuildNumber(client, ref, buildNumber) ?? await findInRecentRuns(client, ref, buildNumber);
+	if (!found) throw new Error(`Could not find pipeline #${buildNumber} in the ${BUILD_NUMBER_SCAN_LIMIT} most recent runs. It may be too old.`);
+	return toPipelineDetail(ref, found);
 }
-function externalMedia(href, alt) {
-	return mediaNode({
-		type: "external",
-		url: href
-	}, alt);
+async function fetchByBuildNumber(client, ref, buildNumber) {
+	try {
+		return await client.getJson(`${pipelinesPath(ref)}/${encodeURIComponent(String(buildNumber))}`);
+	} catch (err) {
+		if (err instanceof HttpError && (err.status === 400 || err.status === 404)) return null;
+		throw err;
+	}
 }
-function textToken(text) {
-	return {
-		type: "text",
-		raw: text,
-		text,
-		escaped: false
-	};
+async function findInRecentRuns(client, ref, buildNumber) {
+	const first = `${pipelinesPath(ref)}?${pipelinesQuery(100)}`;
+	let scanned = 0;
+	for await (const pipeline of walkPages(client, first)) {
+		if (pipeline.build_number === buildNumber) return pipeline;
+		if (++scanned >= BUILD_NUMBER_SCAN_LIMIT) break;
+	}
+	return null;
 }
-function clampLevel$1(value) {
-	return Math.min(6, Math.max(1, Math.trunc(value) || 1));
+async function listSteps(client, ref, pipelineId) {
+	const out = [];
+	const first = `${pipelinesPath(ref)}/${encodeURIComponent(pipelineId)}/steps`;
+	for await (const step of walkPages(client, first)) out.push(toStepSummary(step));
+	return out;
 }
 //#endregion
-//#region src/api/confluence-attachments.ts
-const UNKNOWN_SIZE = -1;
-async function listAttachments(client, id) {
-	return (await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}/attachments?limit=250`)).results.map((a) => ({
-		filename: a.title ?? a.id,
-		fileId: mediaNodeId(a),
-		size: typeof a.fileSize === "number" ? a.fileSize : UNKNOWN_SIZE
-	}));
+//#region src/commands/bitbucket.ts
+async function bitbucketPipelines({ session, term }, options) {
+	const ref = resolveRepo(options.repo, session);
+	const limit = parseLimit(options.limit);
+	writeRows(term, pipelineRows(await withScopeHint(PIPELINE_SCOPE, () => listPipelines(session, ref, limit)), Date.now()), {
+		json: options.json,
+		empty: "No pipelines found."
+	});
 }
-async function uploadAttachment(client, pageId, filename, bytes) {
-	return (await client.postMultipart(`/wiki/rest/api/content/${encodeURIComponent(pageId)}/child/attachment`, filename, bytes)).results?.[0]?.extensions?.fileId ?? await fileIdByListing(client, pageId, filename);
+async function bitbucketPipeline({ session, term }, arg, options) {
+	const buildNumber = parseBuildNumber(arg);
+	const ref = resolveRepo(options.repo, session);
+	const detail = await withScopeHint(PIPELINE_SCOPE, () => getPipeline(session, ref, buildNumber));
+	const steps = await withScopeHint(PIPELINE_SCOPE, () => listSteps(session, ref, detail.uuid));
+	term.out(formatPipelineDetail(detail, steps, Date.now()));
 }
-async function fileIdByListing(client, pageId, filename) {
-	const match = (await listAttachments(client, pageId)).find((a) => a.filename === filename);
-	if (match) return match.fileId;
-	throw new Error(`Upload of "${filename}" did not return a fileId.`);
+function pipelineRows(pipelines, nowMs) {
+	return alignedRows(pipelines, nowMs, (p) => ({
+		id: `#${p.buildNumber}`,
+		url: p.url,
+		label: p.status || "-",
+		color: colorForBitbucketState(p.status),
+		text: `${refWithCommit(p)} · ${formatDuration(p.durationSeconds)}`,
+		timestamp: p.createdOn
+	}));
 }
-async function fetchAttachments(client, id) {
-	return (await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}/attachments?limit=250`)).results.filter((a) => a.downloadLink).map((a) => ({
-		mediaId: mediaNodeId(a),
-		filename: a.title ?? a.id,
-		url: withWikiContextPath(a.downloadLink ?? "")
+function formatStepRows(steps) {
+	const rows = steps.map((s) => ({
+		name: s.name || "-",
+		status: s.status || "-",
+		dur: formatDuration(s.durationSeconds)
 	}));
+	const wn = Math.max(...rows.map((r) => r.name.length));
+	const ws = Math.max(...rows.map((r) => r.status.length));
+	return rows.map((r) => `  ${r.name.padEnd(wn)}  ${r.status.padEnd(ws)}  ${r.dur}`);
 }
-function mediaNodeId(a) {
-	return a.fileId ?? a.id;
+function formatPipelineDetail(detail, steps, nowMs) {
+	const by = detail.creator ? ` by ${detail.creator}` : "";
+	return [
+		`Pipeline #${detail.buildNumber}  ${detail.status || "-"}`,
+		...detail.repo ? [`Repo:     ${detail.repo}`] : [],
+		`Ref:      ${refWithCommit(detail)}`,
+		...detail.trigger ? [`Trigger:  ${detail.trigger}`] : [],
+		`Duration: ${formatDuration(detail.durationSeconds)}`,
+		`Created:  ${relativeTime(detail.createdOn, nowMs)}${by}`,
+		...steps.length > 0 ? [
+			"",
+			"Steps:",
+			...formatStepRows(steps)
+		] : []
+	];
 }
-function withWikiContextPath(link) {
-	if (link.startsWith("http") || link.startsWith("/wiki")) return link;
-	return `/wiki${link}`;
+function refWithCommit(pipeline) {
+	if (!pipeline.ref) return pipeline.commit || "-";
+	return pipeline.commit ? `${pipeline.ref} (${pipeline.commit})` : pipeline.ref;
 }
-//#endregion
-//#region src/api/confluence-pages.ts
-async function fetchPage(client, site, id) {
-	const page = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}?body-format=atlas_doc_format`);
-	const names = new UserNames(client);
-	const [spaceKey, attachments, comments, author] = await Promise.all([
-		fetchSpaceKey(client, page.spaceId),
-		fetchAttachments(client, id),
-		fetchComments$1(client, id, names),
-		names.resolve(page.version?.authorId ?? page.authorId)
-	]);
-	const webui = page._links?.webui ?? "";
-	return {
-		id: page.id,
-		title: page.title,
-		spaceKey,
-		version: page.version?.number ?? 0,
-		author,
-		createdAt: page.createdAt ?? "",
-		updatedAt: page.version?.createdAt ?? "",
-		url: webui ? `${site}/wiki${webui}` : "",
-		body: parseAdfJson(page.body?.atlas_doc_format?.value),
-		attachments,
-		comments
-	};
+function parseBuildNumber(arg) {
+	const raw = (arg ?? "").replace(/^#/, "").trim();
+	if (!/^\d+$/.test(raw)) throw new Error(`Invalid pipeline number "${arg ?? ""}". Expected a build number, e.g. 123.`);
+	return Number.parseInt(raw, 10);
 }
-async function fetchPageState(client, id) {
-	const page = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}?body-format=atlas_doc_format`);
-	return {
-		version: page.version?.number ?? 0,
-		title: page.title,
-		body: parseAdfJson(page.body?.atlas_doc_format?.value)
-	};
+//#endregion
+//#region src/cli/bitbucket.ts
+function registerBitbucket(bitbucket) {
+	bitbucket.description("Bitbucket commands");
+	bitbucket.command("login").description("Store Bitbucket workspace and API token").action(bareAction(bitbucketLogin));
+	bitbucket.command("logout").description("Remove stored Bitbucket credentials").action(bareAction(bitbucketLogout));
+	bitbucket.command("status").description("Show the current Bitbucket login").action(bareAction(bitbucketStatus));
+	bitbucket.command("pipelines").description("List recent pipeline runs for a repo").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").action(bitbucketAction(bitbucketPipelines));
+	bitbucket.command("prs").description("List pull requests for a repo").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").option("-s, --state <state...>", "open, merged, declined, or superseded").option("--all", "include every state").option("-a, --author <who>", "limit to an author ('me', an account id, or a uuid)").option("--reviewer <who>", "limit to a reviewer ('me', an account id, or a uuid)").option("-q, --query <bbql>", "raw Bitbucket query (not for use with --author or --reviewer)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").action(bitbucketAction(bitbucketPrs));
+	bitbucket.command("pr <id>").description("Show one pull request, its reviewers, files, and comments").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").option("--all-comments", "show all comments instead of the last 5").option("--no-pager", "print directly instead of paging long output").option("--json", "output the pull request as JSON").action(bitbucketAction(bitbucketPr));
+	bitbucket.command("pipeline <number>").description("Show one pipeline run and its steps").option("-r, --repo <repo>", "workspace/slug, or a bare slug (defaults to config)").action(bitbucketAction(bitbucketPipeline));
+	return bitbucket;
 }
-async function updatePage(client, id, params) {
-	return (await client.putJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}`, {
-		id,
-		status: "current",
-		title: params.title,
-		body: {
-			representation: "atlas_doc_format",
-			value: JSON.stringify(params.body)
-		},
-		version: {
-			number: params.nextVersion,
-			message: params.message
-		}
-	})).version?.number ?? params.nextVersion;
+//#endregion
+//#region src/cli/search-options.ts
+function collect(value, previous = []) {
+	return [...previous, value];
 }
-async function fetchSpaceKey(client, spaceId) {
-	if (!spaceId) return "";
-	try {
-		return (await client.getJson(`/wiki/api/v2/spaces/${encodeURIComponent(spaceId)}`)).key ?? "";
-	} catch {
-		return "";
-	}
+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>"\`.`);
+	});
 }
-async function fetchComments$1(client, id, names) {
-	const res = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}/footer-comments?body-format=atlas_doc_format&limit=250`);
-	return Promise.all(res.results.map(async (c) => ({
-		author: await names.resolve(c.version?.authorId),
-		created: c.version?.createdAt ?? "",
-		body: parseAdfJson(c.body?.atlas_doc_format?.value)
-	})));
+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");
 }
-function parseAdfJson(value) {
-	if (!value) return null;
-	try {
-		return JSON.parse(value);
-	} catch {
-		return null;
-	}
+//#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}`;
 }
-var UserNames = class {
-	client;
-	cache = /* @__PURE__ */ new Map();
-	constructor(client) {
-		this.client = client;
-	}
-	async resolve(accountId) {
-		if (!accountId) return "";
-		const cached = this.cache.get(accountId);
-		if (cached !== void 0) return cached;
-		const name = await this.fetchDisplayName(accountId) ?? accountId;
-		this.cache.set(accountId, name);
-		return name;
-	}
-	async fetchDisplayName(accountId) {
-		try {
-			return (await this.client.getJson(`/wiki/rest/api/user?accountId=${encodeURIComponent(accountId)}`)).displayName || null;
-		} catch {
-			return null;
-		}
-	}
-};
 //#endregion
 //#region src/util/html.ts
 const MAX_CODE_POINT = 1114111;
@@ -1472,18 +1938,20 @@ function isCodePoint(code) {
 //#endregion
 //#region src/api/confluence-search.ts
 async function searchPages(client, site, params) {
-	const cql = buildCql(params);
+	return searchPagesByCql(client, site, buildCql(params), params.limit);
+}
+async function searchPagesByCql(client, site, cql, limit) {
 	const query = new URLSearchParams({
 		cql,
-		limit: String(params.limit),
-		expand: "space"
+		limit: String(limit),
+		expand: "content.space"
 	});
 	const results = (await client.getJson(`/wiki/rest/api/search?${query.toString()}`)).results ?? [];
-	const serverPageWasFull = results.length === params.limit;
+	const serverPageWasFull = results.length === limit;
 	return {
 		pages: results.filter((r) => r.content?.id).map((r) => ({
 			id: r.content?.id ?? "",
-			space: r.space?.key ?? r.resultGlobalContainer?.title ?? "",
+			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}` : ""
@@ -1491,374 +1959,362 @@ async function searchPages(client, site, params) {
 		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")}"`;
+const SPACE_URL = /\/spaces\/([^/?#]+)/;
+function spaceKeyOf(displayUrl) {
+	return SPACE_URL.exec(displayUrl ?? "")?.[1] ?? "";
 }
-//#endregion
-//#region src/commands/resolve-ref.ts
-async function resolveRef(ask, arg, kind) {
-	const raw = arg ?? await ask.text({
-		message: kind.message,
-		flag: kind.flag,
-		required: true
-	});
-	const ref = kind.parse(raw);
-	if (!ref) throw new Error(kind.notFound(raw));
-	return ref;
+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/to-markdown-inline.ts
-function renderMedia(node, ctx) {
-	const attrs = node.attrs ?? {};
-	const alt = attrs.alt ?? "";
-	const resolved = ctx.resolveMedia?.(attrs);
-	if (resolved) return `![${alt}](${resolved})`;
-	return `[embedded media: ${alt || attrs.id || "media"}]`;
+//#region src/adf/from-markdown.ts
+function mediaNode(source, alt) {
+	const attrs = { ...source };
+	if (alt) attrs["alt"] = alt;
+	return {
+		type: "mediaSingle",
+		attrs: { layout: "center" },
+		content: [{
+			type: "media",
+			attrs
+		}]
+	};
 }
-function renderInline(nodes, ctx) {
-	return nodes.map((n) => renderInlineNode(n, ctx)).join("");
+function imageHrefs(md) {
+	const hrefs = /* @__PURE__ */ new Set();
+	marked.walkTokens(marked.lexer(md), (token) => {
+		if (token.type === "image") hrefs.add(token.href);
+	});
+	return [...hrefs];
 }
-function renderInlineNode(node, ctx) {
-	switch (node.type) {
-		case "text": return applyMarks(node.text ?? "", node.marks ?? []);
-		case "hardBreak": return "  \n";
-		case "mention": return (typeof node.attrs?.["text"] === "string" ? node.attrs["text"] : "") || "@unknown";
-		case "emoji": {
-			const text = node.attrs?.["text"];
-			if (typeof text === "string" && text.length > 0) return text;
-			const short = node.attrs?.["shortName"];
-			return typeof short === "string" ? short : "";
-		}
-		case "date": return formatDate(node.attrs?.["timestamp"]);
-		case "status": return `\`[${typeof node.attrs?.["text"] === "string" ? node.attrs["text"] : ""}]\``;
-		case "inlineCard": {
-			const url = node.attrs?.["url"];
-			if (typeof url === "string") return `[${url}](${url})`;
-			return "";
-		}
-		case "media": return renderMedia(node, ctx);
-		default: return node.text ?? "";
-	}
+function markdownToAdf(md, options = {}) {
+	const ctx = { resolveImage: options.resolveImage ?? externalMedia };
+	return {
+		type: "doc",
+		version: 1,
+		content: blocks(marked.lexer(md), ctx)
+	};
 }
-function applyMarks(text, marks) {
-	if (text.length === 0) return text;
-	let out = text;
-	let href;
-	for (const mark of marks) switch (mark.type) {
-		case "code":
-			out = `\`${out}\``;
-			break;
-		case "strong":
-			out = `**${out}**`;
-			break;
-		case "em":
-			out = `*${out}*`;
-			break;
-		case "strike":
-			out = `~~${out}~~`;
-			break;
-		case "link": {
-			const value = mark.attrs?.["href"];
-			if (typeof value === "string") href = value;
-			break;
-		}
-	}
-	if (href) out = `[${out}](${href})`;
+function blocks(tokens, ctx) {
+	const out = [];
+	for (const token of tokens) out.push(...block(token, ctx));
 	return out;
 }
-function formatDate(timestamp) {
-	const ms = typeof timestamp === "string" ? Number(timestamp) : typeof timestamp === "number" ? timestamp : NaN;
-	if (Number.isNaN(ms)) return "";
-	return new Date(ms).toISOString().slice(0, 10);
-}
-//#endregion
-//#region src/adf/to-markdown.ts
-function adfToMarkdown(doc, options = {}) {
-	if (!doc) return "";
-	const ctx = { resolveMedia: options.resolveMedia };
-	return (doc.type === "doc" ? renderBlocks(doc.content ?? [], ctx, "") : renderBlock(doc, ctx, "")).trim();
-}
-function renderBlocks(nodes, ctx, indent) {
-	return nodes.map((n) => renderBlock(n, ctx, indent)).filter((s) => s.length > 0).join("\n\n");
-}
-function renderBlock(node, ctx, indent) {
-	switch (node.type) {
-		case "paragraph": return indent + renderInline(node.content ?? [], ctx);
-		case "heading": {
-			const level = clampLevel(node.attrs?.["level"]);
-			return `${"#".repeat(level)} ${renderInline(node.content ?? [], ctx)}`;
-		}
-		case "bulletList": return renderList(node, ctx, indent, "bullet");
-		case "orderedList": return renderList(node, ctx, indent, "ordered");
-		case "taskList": return renderTaskList(node, ctx, indent);
-		case "decisionList": return renderDecisionList(node, ctx, indent);
-		case "codeBlock": return renderCodeBlock(node, indent);
-		case "blockquote": return prefixLines(renderBlocks(node.content ?? [], ctx, ""), `${indent}> `);
-		case "panel": return renderPanel(node, ctx, indent);
-		case "rule": return `${indent}---`;
-		case "table": return renderTable(node, ctx);
-		case "mediaSingle":
-		case "mediaGroup": return renderBlocks(node.content ?? [], ctx, indent);
-		case "media": return indent + renderMedia(node, ctx);
-		case "expand":
-		case "nestedExpand": return renderExpand(node, ctx, indent);
-		default:
-			if (node.content?.length) return renderBlocks(node.content, ctx, indent);
-			return node.text ? indent + node.text : "";
-	}
-}
-function renderList(node, ctx, indent, kind) {
-	const start = kind === "ordered" ? toNumber(node.attrs?.["order"]) ?? 1 : 0;
-	return (node.content ?? []).filter((n) => n.type === "listItem").map((item, i) => {
-		return renderListItem(item, ctx, indent, kind === "ordered" ? `${start + i}. ` : "- ");
-	}).join("\n");
-}
-function renderListItem(item, ctx, indent, marker) {
-	const continuationIndent = `${indent}${" ".repeat(marker.length)}`;
-	return (item.content ?? []).map((block, i) => i === 0 ? `${indent}${marker}${renderBlock(block, ctx, "")}` : renderBlock(block, ctx, continuationIndent)).join("\n");
-}
-function renderTaskList(node, ctx, indent) {
-	return (node.content ?? []).filter((n) => n.type === "taskItem").map((item) => {
-		return `${indent}- [${item.attrs?.["state"] === "DONE" ? "x" : " "}] ${renderInline(item.content ?? [], ctx)}`;
-	}).join("\n");
-}
-function renderDecisionList(node, ctx, indent) {
-	return (node.content ?? []).filter((n) => n.type === "decisionItem").map((item) => `${indent}- (decision) ${renderInline(item.content ?? [], ctx)}`).join("\n");
+function block(token, ctx) {
+	switch (token.type) {
+		case "space": return [];
+		case "heading": return [{
+			type: "heading",
+			attrs: { level: clampLevel(token.depth) },
+			content: inline(token.tokens ?? [], ctx)
+		}];
+		case "paragraph": return paragraphsSplitAtImages(token.tokens ?? [], ctx);
+		case "text": return paragraphsSplitAtImages(token.tokens ?? [textToken(token.text)], ctx);
+		case "list": return [list(token, ctx)];
+		case "code": return [codeBlock(token)];
+		case "blockquote": return [{
+			type: "blockquote",
+			content: blocks(token.tokens ?? [], ctx)
+		}];
+		case "table": return [table(token, ctx)];
+		case "hr": return [{ type: "rule" }];
+		default: return [];
+	}
 }
-function renderCodeBlock(node, indent) {
-	const lang = typeof node.attrs?.["language"] === "string" ? node.attrs["language"] : "";
-	const code = (node.content ?? []).map((n) => n.text ?? "").join("");
-	const fence = "```";
-	return prefixLines(`${fence}${lang}\n${code}\n${fence}`, indent);
+function paragraphsSplitAtImages(tokens, ctx) {
+	const out = [];
+	let buffer = [];
+	const flush = () => {
+		if (buffer.length === 0) return;
+		const nodes = inline(buffer, ctx);
+		if (nodes.length > 0) out.push({
+			type: "paragraph",
+			content: nodes
+		});
+		buffer = [];
+	};
+	for (const token of tokens) if (token.type === "image") {
+		flush();
+		const image = token;
+		const node = ctx.resolveImage(image.href, image.text ?? "");
+		if (node) out.push(node);
+	} else buffer.push(token);
+	flush();
+	return out;
 }
-const PANEL_LABELS = {
-	info: "Info",
-	note: "Note",
-	warning: "Warning",
-	success: "Success",
-	error: "Error"
-};
-function renderPanel(node, ctx, indent) {
-	const type = typeof node.attrs?.["panelType"] === "string" ? node.attrs["panelType"] : "info";
-	return prefixLines(`**${PANEL_LABELS[type] ?? "Note"}**\n\n${renderBlocks(node.content ?? [], ctx, "")}`, `${indent}> `);
+function list(token, ctx) {
+	if (token.items.length > 0 && token.items.every((i) => i.task)) return {
+		type: "taskList",
+		attrs: { localId: randomUUID() },
+		content: token.items.map((item) => ({
+			type: "taskItem",
+			attrs: {
+				localId: randomUUID(),
+				state: item.checked ? "DONE" : "TODO"
+			},
+			content: inline(taskItemInline(item), ctx)
+		}))
+	};
+	const node = {
+		type: token.ordered ? "orderedList" : "bulletList",
+		content: token.items.map((item) => listItem(item, ctx))
+	};
+	const start = Number(token.start);
+	if (token.ordered && Number.isFinite(start) && start !== 1) node.attrs = { order: start };
+	return node;
 }
-function renderExpand(node, ctx, indent) {
-	return `${indent}<details><summary>${typeof node.attrs?.["title"] === "string" ? node.attrs["title"] : "Details"}</summary>\n\n${renderBlocks(node.content ?? [], ctx, "")}\n\n${indent}</details>`;
+function listItem(item, ctx) {
+	const children = blocks(item.tokens.filter((t) => t.type !== "checkbox"), ctx);
+	return {
+		type: "listItem",
+		content: children.length > 0 ? children : [emptyParagraph()]
+	};
 }
-function renderTable(node, ctx) {
-	const rows = (node.content ?? []).filter((n) => n.type === "tableRow");
-	if (rows.length === 0) return "";
-	const grid = rows.map((row) => (row.content ?? []).map((cell) => renderCellOnOneLine(cell, ctx)));
-	const cols = Math.max(...grid.map((r) => r.length));
-	const pad = (r) => {
-		const copy = [...r];
-		while (copy.length < cols) copy.push("");
-		return copy;
+function emptyParagraph() {
+	return {
+		type: "paragraph",
+		content: []
 	};
-	const header = pad(grid[0] ?? []);
-	const lines = [`| ${header.join(" | ")} |`, `| ${header.map(() => "---").join(" | ")} |`];
-	for (const row of grid.slice(1)) lines.push(`| ${pad(row).join(" | ")} |`);
-	return lines.join("\n");
 }
-function renderCellOnOneLine(cell, ctx) {
-	return renderBlocks(cell.content ?? [], ctx, "").replace(/\n+/g, " ").replace(/\|/g, "\\|").trim();
+function taskItemInline(item) {
+	const first = item.tokens.find((t) => t.type === "text");
+	if (first && "tokens" in first && first.tokens) return first.tokens;
+	return [textToken(item.text)];
 }
-function prefixLines(text, prefix) {
-	return text.split("\n").map((line) => line.length > 0 ? prefix + line : prefix.trimEnd()).join("\n");
+function codeBlock(token) {
+	return {
+		type: "codeBlock",
+		attrs: token.lang ? { language: token.lang } : {},
+		content: token.text.length > 0 ? [{
+			type: "text",
+			text: token.text
+		}] : []
+	};
 }
-function clampLevel(value) {
-	const n = toNumber(value) ?? 1;
-	return Math.min(6, Math.max(1, n));
+function table(token, ctx) {
+	return {
+		type: "table",
+		content: [{
+			type: "tableRow",
+			content: token.header.map((cell) => tableCell(cell, "tableHeader", ctx))
+		}, ...token.rows.map((row) => ({
+			type: "tableRow",
+			content: row.map((cell) => tableCell(cell, "tableCell", ctx))
+		}))]
+	};
 }
-function toNumber(value) {
-	return typeof value === "number" ? value : void 0;
+function tableCell(cell, type, ctx) {
+	return {
+		type,
+		content: [{
+			type: "paragraph",
+			content: inline(cell.tokens, ctx)
+		}]
+	};
 }
-//#endregion
-//#region src/markdown/highlight.ts
-const HEADING = /^#{1,6} /;
-const QUOTE = /^(\s*)>( |$)/;
-const LIST = /^(\s*)(-|\d+\.) (\[[ x]\] )?/;
-const RULE = /^\s*---$/;
-const TABLE_ROW = /^\|.*\|$/;
-const TABLE_SEPARATOR = /^\|( --- \|)+$/;
-const CELL_DIVIDER = /(?<!\\)\|/;
-const DETAILS_OPEN = /^(\s*)<details><summary>(.*)<\/summary>$/;
-const DETAILS_CLOSE = /^\s*<\/details>$/;
-const FENCE_OPEN = /^((?:\s|> |- |\d+\. )*)```(\S*)$/;
-const FENCE = "```";
-const INLINE = /(`[^`]+`)|\[([^\]]+)\]\(((?:[^()]|\([^()]*\))+)\)|\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(?!\*)(.+?)(?<!\*)\*(?!\*)|~~(.+?)~~/g;
-const TOKEN_STYLES = {
-	keyword: kleur.magenta,
-	built_in: kleur.magenta,
-	literal: kleur.magenta,
-	string: kleur.green,
-	regexp: kleur.green,
-	addition: kleur.green,
-	number: kleur.yellow,
-	symbol: kleur.yellow,
-	meta: kleur.yellow,
-	attr: kleur.yellow,
-	comment: kleur.dim,
-	quote: kleur.dim,
-	deletion: kleur.dim,
-	title: kleur.cyan,
-	type: kleur.cyan,
-	section: kleur.cyan
-};
-const lowlight = createLowlight(common);
-function highlightMarkdown(md) {
-	const lines = md.split("\n");
+function inline(tokens, ctx, marks = []) {
 	const out = [];
-	for (let i = 0; i < lines.length; i++) {
-		const line = lines[i] ?? "";
-		const fence = line.match(FENCE_OPEN);
-		if (!fence) {
-			out.push(highlightLine(line, lines[i + 1]));
-			continue;
-		}
-		const [, prefix = "", lang = ""] = fence;
-		const styledPrefix = prefix.replace(/\S+/g, (marker) => kleur.dim(marker));
-		out.push(`${styledPrefix}${kleur.dim(`${FENCE}${lang}`)}`);
-		const code = [];
-		const prefixed = [];
-		let j = i + 1;
-		for (; j < lines.length; j++) {
-			const raw = lines[j] ?? "";
-			const hasPrefix = raw.startsWith(prefix) || raw === prefix.trimEnd();
-			const body = raw.startsWith(prefix) ? raw.slice(prefix.length) : hasPrefix ? "" : raw;
-			if (body === FENCE) break;
-			code.push(body);
-			prefixed.push(hasPrefix);
+	for (const token of tokens) out.push(...inlineNode(token, ctx, marks));
+	return out;
+}
+function inlineNode(token, ctx, marks) {
+	switch (token.type) {
+		case "text":
+		case "escape": {
+			const t = token;
+			if ("tokens" in t && t.tokens?.length) return inline(t.tokens, ctx, marks);
+			return textNode(t.text, marks);
 		}
-		if (code.length > 0) highlightCode(code.join("\n"), lang).split("\n").forEach((codeLine, k) => {
-			const lead = prefixed[k] ? styledPrefix : "";
-			out.push(codeLine ? `${lead}${codeLine}` : lead.trimEnd());
-		});
-		if (j < lines.length) {
-			const lead = (lines[j] ?? "").startsWith(prefix) ? styledPrefix : "";
-			out.push(`${lead}${kleur.dim(FENCE)}`);
+		case "strong": return inline(token.tokens, ctx, withUniqueMark(marks, { type: "strong" }));
+		case "em": return inline(token.tokens, ctx, withUniqueMark(marks, { type: "em" }));
+		case "del": return inline(token.tokens, ctx, withUniqueMark(marks, { type: "strike" }));
+		case "codespan": return textNode(token.text, withUniqueMark(marks, { type: "code" }));
+		case "link": {
+			const link = token;
+			return inline(link.tokens, ctx, withUniqueMark(marks, {
+				type: "link",
+				attrs: { href: link.href }
+			}));
 		}
-		i = j;
+		case "br": return [{ type: "hardBreak" }];
+		case "html": return textNode(token.text, marks);
+		default: return "text" in token && token.text ? textNode(token.text, marks) : [];
 	}
-	return out.join("\n");
 }
-function highlightCode(code, lang) {
-	if (!lang || !lowlight.registered(lang)) return styleEachLine(code, kleur.yellow);
-	return renderTree(lowlight.highlight(lang, code), (text) => text);
+function textNode(text, marks) {
+	if (text.length === 0) return [];
+	const node = {
+		type: "text",
+		text
+	};
+	if (marks.length > 0) node.marks = marks;
+	return [node];
 }
-function renderTree(node, style) {
-	if (node.type === "text") return styleEachLine(node.value, style);
-	if (node.type !== "root" && node.type !== "element") return "";
-	const own = node.type === "element" ? tokenStyle(node.properties["className"]) : void 0;
-	const next = own ? (text) => style(own(text)) : style;
-	return node.children.map((child) => renderTree(child, next)).join("");
+function withUniqueMark(marks, mark) {
+	return [...marks.filter((m) => m.type !== mark.type), mark];
 }
-function tokenStyle(className) {
-	if (!Array.isArray(className)) return void 0;
-	for (const name of className) {
-		if (typeof name !== "string" || !name.startsWith("hljs-")) continue;
-		const style = TOKEN_STYLES[name.slice(5)];
-		if (style) return style;
-	}
+function externalMedia(href, alt) {
+	return mediaNode({
+		type: "external",
+		url: href
+	}, alt);
 }
-function styleEachLine(text, style) {
-	return text.split("\n").map((line) => line ? style(line) : line).join("\n");
+function textToken(text) {
+	return {
+		type: "text",
+		raw: text,
+		text,
+		escaped: false
+	};
+}
+function clampLevel(value) {
+	return Math.min(6, Math.max(1, Math.trunc(value) || 1));
 }
-function highlightLine(line, nextLine) {
-	const quote = line.match(QUOTE);
-	if (quote) {
-		const [whole, indent = ""] = quote;
-		const rest = line.slice(whole.length);
-		const gap = whole.endsWith(" ") ? " " : "";
-		return `${indent}${kleur.dim(">")}${gap}${highlightLine(rest, stripPrefix(nextLine, whole))}`;
-	}
-	const list = line.match(LIST);
-	if (list) {
-		const [whole, indent = "", marker = "", checkbox] = list;
-		const rest = line.slice(whole.length);
-		const box = checkbox ? `${kleur.bold(checkbox.trim())} ` : "";
-		return `${indent}${kleur.dim(marker)} ${box}${highlightLine(rest, void 0)}`;
-	}
-	if (HEADING.test(line)) return kleur.bold().cyan(line);
-	if (RULE.test(line)) return kleur.dim(line);
-	if (TABLE_SEPARATOR.test(line)) return kleur.dim(line);
-	if (TABLE_ROW.test(line)) return tableRow(line, nextLine !== void 0 && TABLE_SEPARATOR.test(nextLine));
-	const details = line.match(DETAILS_OPEN);
-	if (details) {
-		const [, indent = "", title = ""] = details;
-		return `${indent}${kleur.dim("<details><summary>")}${highlightInline(title)}${kleur.dim("</summary>")}`;
-	}
-	if (DETAILS_CLOSE.test(line)) return kleur.dim(line);
-	return highlightInline(line);
+//#endregion
+//#region src/api/confluence-attachments.ts
+const UNKNOWN_SIZE = -1;
+async function listAttachments(client, id) {
+	return (await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}/attachments?limit=250`)).results.map((a) => ({
+		filename: a.title ?? a.id,
+		fileId: mediaNodeId(a),
+		size: typeof a.fileSize === "number" ? a.fileSize : UNKNOWN_SIZE
+	}));
 }
-function stripPrefix(line, prefix) {
-	return line?.startsWith(prefix) ? line.slice(prefix.length) : void 0;
+async function uploadAttachment(client, pageId, filename, bytes) {
+	return (await client.postMultipart(`/wiki/rest/api/content/${encodeURIComponent(pageId)}/child/attachment`, filename, bytes)).results?.[0]?.extensions?.fileId ?? await fileIdByListing(client, pageId, filename);
 }
-function tableRow(line, header) {
-	const styled = line.split(CELL_DIVIDER).slice(1, -1).map((cell) => header ? kleur.bold(highlightInline(cell)) : highlightInline(cell));
-	const pipe = kleur.dim("|");
-	return `${pipe}${styled.join(pipe)}${pipe}`;
+async function fileIdByListing(client, pageId, filename) {
+	const match = (await listAttachments(client, pageId)).find((a) => a.filename === filename);
+	if (match) return match.fileId;
+	throw new Error(`Upload of "${filename}" did not return a fileId.`);
 }
-function highlightInline(text) {
-	return text.replace(INLINE, (match, code, linkText, url, boldItalic, bold, italic, strike) => {
-		if (code !== void 0) return kleur.yellow(code);
-		if (linkText !== void 0 && url !== void 0) return link(linkText, url);
-		if (boldItalic !== void 0) return kleur.bold().italic(match);
-		if (bold !== void 0) return kleur.bold(`**${highlightInline(bold)}**`);
-		if (italic !== void 0) return kleur.italic(`*${highlightInline(italic)}*`);
-		if (strike !== void 0) return kleur.strikethrough(`~~${highlightInline(strike)}~~`);
-		return match;
-	});
+async function fetchAttachments(client, id) {
+	return (await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}/attachments?limit=250`)).results.filter((a) => a.downloadLink).map((a) => ({
+		mediaId: mediaNodeId(a),
+		filename: a.title ?? a.id,
+		url: withWikiContextPath(a.downloadLink ?? "")
+	}));
 }
-function link(text, url) {
-	const open = kleur.dim("[");
-	const middle = kleur.dim("](");
-	return `${open}${highlightInline(text)}${middle}${kleur.dim().underline(url)}${kleur.dim(")")}`;
+function mediaNodeId(a) {
+	return a.fileId ?? a.id;
+}
+function withWikiContextPath(link) {
+	if (link.startsWith("http") || link.startsWith("/wiki")) return link;
+	return `/wiki${link}`;
 }
 //#endregion
-//#region src/commands/view.ts
-function fieldLines(pairs) {
-	const kept = pairs.filter(([, value]) => value !== "");
-	const width = Math.max(...kept.map(([label]) => label.length)) + 1;
-	return kept.map(([label, value]) => `${kleur.dim(`${label}:`.padEnd(width))}  ${value}`);
+//#region src/api/confluence-pages.ts
+async function fetchPage(client, site, id) {
+	const page = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}?body-format=atlas_doc_format`);
+	const names = new UserNames(client);
+	const [spaceKey, attachments, comments, author] = await Promise.all([
+		fetchSpaceKey(client, page.spaceId),
+		fetchAttachments(client, id),
+		fetchComments$1(client, id, names),
+		names.resolve(page.version?.authorId ?? page.authorId)
+	]);
+	const webui = page._links?.webui ?? "";
+	return {
+		id: page.id,
+		title: page.title,
+		spaceKey,
+		version: page.version?.number ?? 0,
+		author,
+		createdAt: page.createdAt ?? "",
+		updatedAt: page.version?.createdAt ?? "",
+		url: webui ? `${site}/wiki${webui}` : "",
+		body: parseAdfJson(page.body?.atlas_doc_format?.value),
+		attachments,
+		comments
+	};
 }
-function dateWithAge(iso, nowMs) {
-	if (!iso) return "";
-	return `${formatDateTime(iso).slice(0, 10)} (${relativeTime(iso, nowMs)})`;
+async function fetchPageState(client, id) {
+	const page = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}?body-format=atlas_doc_format`);
+	return {
+		version: page.version?.number ?? 0,
+		title: page.title,
+		body: parseAdfJson(page.body?.atlas_doc_format?.value)
+	};
 }
-function bodyLines(body) {
-	const md = adfToMarkdown(body);
-	return md ? ["", highlightMarkdown(md)] : [];
+async function updatePage(client, id, params) {
+	return (await client.putJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}`, {
+		id,
+		status: "current",
+		title: params.title,
+		body: {
+			representation: "atlas_doc_format",
+			value: JSON.stringify(params.body)
+		},
+		version: {
+			number: params.nextVersion,
+			message: params.message
+		}
+	})).version?.number ?? params.nextVersion;
 }
-function commentSection(comments, allComments) {
-	if (comments.length === 0) return [];
-	const visible = allComments ? comments : comments.slice(-5);
-	const heading = comments.length - visible.length > 0 ? `Comments (${comments.length}, showing last ${visible.length} — --all-comments for all)` : `Comments (${comments.length})`;
-	const lines = ["", kleur.bold(heading)];
-	for (const comment of visible) {
-		const body = adfToMarkdown(comment.body);
-		lines.push("", commentHeader(comment), ...body ? [highlightMarkdown(body)] : []);
+async function fetchSpaceKey(client, spaceId) {
+	if (!spaceId) return "";
+	try {
+		return (await client.getJson(`/wiki/api/v2/spaces/${encodeURIComponent(spaceId)}`)).key ?? "";
+	} catch {
+		return "";
 	}
-	return lines;
 }
-function commentHeader(comment) {
-	return `─ ${kleur.bold(comment.author || "Unknown")}${comment.created ? ` · ${kleur.dim(formatDateTime(comment.created))}` : ""}`;
+async function fetchComments$1(client, id, names) {
+	const res = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}/footer-comments?body-format=atlas_doc_format&limit=250`);
+	return Promise.all(res.results.map(async (c) => ({
+		author: await names.resolve(c.version?.authorId),
+		created: c.version?.createdAt ?? "",
+		body: parseAdfJson(c.body?.atlas_doc_format?.value)
+	})));
 }
-function attachmentSection(attachments) {
-	if (attachments.length === 0) return [];
-	return [
-		"",
-		kleur.bold("Attachments"),
-		...attachments.map((a) => `- ${a.filename}`)
-	];
+function parseAdfJson(value) {
+	if (!value) return null;
+	try {
+		return JSON.parse(value);
+	} catch {
+		return null;
+	}
+}
+var UserNames = class {
+	client;
+	cache = /* @__PURE__ */ new Map();
+	constructor(client) {
+		this.client = client;
+	}
+	async resolve(accountId) {
+		if (!accountId) return "";
+		const cached = this.cache.get(accountId);
+		if (cached !== void 0) return cached;
+		const name = await this.fetchDisplayName(accountId) ?? accountId;
+		this.cache.set(accountId, name);
+		return name;
+	}
+	async fetchDisplayName(accountId) {
+		try {
+			return (await this.client.getJson(`/wiki/rest/api/user?accountId=${encodeURIComponent(accountId)}`)).displayName || null;
+		} catch {
+			return null;
+		}
+	}
+};
+//#endregion
+//#region src/commands/resolve-ref.ts
+async function resolveRef(ask, arg, kind) {
+	const raw = arg ?? await ask.text({
+		message: kind.message,
+		flag: kind.flag,
+		required: true
+	});
+	const ref = kind.parse(raw);
+	if (!ref) throw new Error(kind.notFound(raw));
+	return ref;
 }
 //#endregion
 //#region src/api/attachments.ts
@@ -2376,7 +2832,7 @@ function formatPageView(page, nowMs, allComments) {
 			["URL", page.url]
 		]),
 		...bodyLines(page.body),
-		...commentSection(page.comments, allComments),
+		...commentSection(renderedComments(page.comments), { allComments }),
 		...attachmentSection(page.attachments)
 	];
 }
@@ -2427,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) => ({
@@ -2483,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) {
@@ -2500,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
@@ -2570,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"));
 }
@@ -2647,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
@@ -3272,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({
@@ -3295,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;
@@ -3345,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
@@ -3496,7 +4032,7 @@ function formatIssueView(issue, nowMs, allComments) {
 			["URL", issue.url]
 		]),
 		...bodyLines(issue.description),
-		...commentSection(issue.comments, allComments),
+		...commentSection(renderedComments(issue.comments), { allComments }),
 		...attachmentSection(issue.attachments)
 	];
 }
@@ -3533,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
@@ -3584,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.13.0";
+var version = "2.0.0";
 //#endregion
 //#region src/cli/build.ts
 const PRODUCTS = {