atlass 1.14.0 → 2.1.0

package/dist/{build-CFyTL_x2.mjs → build-_4VuIcqF.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";
@@ -10,6 +10,7 @@ import kleur from "kleur";
 import { common, createLowlight } from "lowlight";
 import { marked } from "marked";
 import { randomUUID } from "node:crypto";
+import { structuredPatch } from "diff";
 //#region src/api/http-error.ts
 var HttpError = class extends Error {
 	status;
@@ -119,6 +120,12 @@ var AtlassianClient = class {
 			body: JSON.stringify(body)
 		});
 	}
+	async deleteNoContent(path) {
+		await this.request(path, {
+			method: "DELETE",
+			headers: { Accept: "application/json" }
+		});
+	}
 	async postMultipart(path, filename, bytes) {
 		const form = new FormData();
 		const blob = new Blob([bytes]);
@@ -528,6 +535,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 }) {
@@ -1334,7 +1376,7 @@ function link(text, url) {
 //#endregion
 //#region src/commands/view.ts
 const INDENT = "  ";
-function fieldLines(pairs) {
+function fieldLines$1(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}`);
@@ -1421,7 +1463,7 @@ function formatPullRequestView(detail, comments, files, nowMs, allComments = fal
 	const label = detail.draft ? "DRAFT" : detail.state || "-";
 	return [
 		kleur.bold(detail.title),
-		...fieldLines([
+		...fieldLines$1([
 			["State", colorForBitbucketState(label)(label)],
 			["Author", detail.author],
 			["Branch", branchLine(detail)],
@@ -1520,6 +1562,19 @@ function hyperlink(text, url) {
 }
 //#endregion
 //#region src/commands/search-run.ts
+function checkedLimit(options) {
+	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
+	return parseLimit(options.limit);
+}
+async function showRows(term, rows, listing, options, noun, copyOne) {
+	await runSearch(term, rows, {
+		json: options.json,
+		copy: options.copy,
+		out: options.out,
+		empty: listing.empty,
+		footer: listing.hasMore ? searchFooter(listing.limit) : void 0
+	}, noun, copyOne);
+}
 function alignedRows(items, nowMs, cells) {
 	const rows = items.map((item) => {
 		const cell = cells(item);
@@ -1829,6 +1884,202 @@ function registerBitbucket(bitbucket) {
 	return bitbucket;
 }
 //#endregion
+//#region src/cli/search-options.ts
+function collect(value, previous = []) {
+	return [...previous, value];
+}
+function moved(flags, command) {
+	const flag = flags.split(" ")[0];
+	return new Option(flags).hideHelp().argParser(() => {
+		throw new Error(`${flag} is now its own command: \`atlass ${command} "<query>"\`.`);
+	});
+}
+function outputOptions(command) {
+	return command.option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").option("-c, --copy", "pick results to copy to Markdown").option("-o, --out <dir>", "output directory for --copy");
+}
+//#endregion
+//#region src/api/confluence-create.ts
+async function findSpaceId(client, key) {
+	return (await client.getJson(`/wiki/api/v2/spaces?keys=${encodeURIComponent(key)}`)).results[0]?.id ?? null;
+}
+async function createPage(client, page) {
+	const res = await client.postJson("/wiki/api/v2/pages", {
+		spaceId: page.spaceId,
+		status: "current",
+		title: page.title,
+		...page.parentId ? { parentId: page.parentId } : {},
+		body: {
+			representation: "atlas_doc_format",
+			value: JSON.stringify(page.body)
+		}
+	});
+	return {
+		id: res.id,
+		version: res.version?.number ?? 1
+	};
+}
+//#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
+	}));
+}
+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 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.`);
+}
+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 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/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
+	};
+}
+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)
+	};
+}
+async function updatePage(client, id, params) {
+	const res = 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
+		}
+	});
+	return {
+		number: res.version?.number ?? params.nextVersion,
+		createdAt: res.version?.createdAt ?? ""
+	};
+}
+async function fetchSpaceKey(client, spaceId) {
+	if (!spaceId) return "";
+	try {
+		return (await client.getJson(`/wiki/api/v2/spaces/${encodeURIComponent(spaceId)}`)).key ?? "";
+	} catch {
+		return "";
+	}
+}
+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 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/adf/html.ts
+const COMMENT = /<!--[\s\S]*?-->/g;
+function isOnlyComments(html) {
+	return html.replace(COMMENT, "").trim().length === 0;
+}
+function withoutComments(md) {
+	const kept = [];
+	let skipSpace = false;
+	for (const token of marked.lexer(md)) {
+		if (skipSpace && token.type === "space") continue;
+		skipSpace = token.type === "html" && isOnlyComments(token.text);
+		if (skipSpace) continue;
+		kept.push(token.type === "code" ? token.raw : token.raw.replace(COMMENT, ""));
+	}
+	return kept.join("").trim();
+}
+function htmlWarnings(md) {
+	let blocks = 0;
+	let inline = 0;
+	marked.walkTokens(marked.lexer(md), (token) => {
+		if (token.type !== "html" || isOnlyComments(token.text)) return;
+		if (token.block) blocks++;
+		else inline++;
+	});
+	return [...blocks > 0 ? [`${counted(blocks, "HTML block")} will be dropped`] : [], ...inline > 0 ? [`${counted(inline, "inline HTML tag")} will be sent as text`] : []];
+}
+function counted(n, noun) {
+	return `${n} ${noun}${n === 1 ? "" : "s"}`;
+}
+//#endregion
 //#region src/adf/from-markdown.ts
 function mediaNode(source, alt) {
 	const attrs = { ...source };
@@ -1999,7 +2250,10 @@ function inlineNode(token, ctx, marks) {
 			}));
 		}
 		case "br": return [{ type: "hardBreak" }];
-		case "html": return textNode(token.text, marks);
+		case "html": {
+			const html = token.text;
+			return isOnlyComments(html) ? [] : textNode(html, marks);
+		}
 		default: return "text" in token && token.text ? textNode(token.text, marks) : [];
 	}
 }
@@ -2033,187 +2287,300 @@ function clampLevel(value) {
 	return Math.min(6, Math.max(1, Math.trunc(value) || 1));
 }
 //#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/adf/lossy.ts
+const LOSSY_LABELS = {
+	panel: "panel",
+	expand: "expand",
+	nestedExpand: "expand",
+	decisionList: "decision list",
+	layoutSection: "layout",
+	extension: "macro",
+	bodiedExtension: "macro",
+	inlineExtension: "macro"
+};
+const JIRA_LOSSY_LABELS = {
+	...LOSSY_LABELS,
+	media: "image",
+	mediaInline: "image"
+};
+function findLossyNodes(node, lossyLabels = LOSSY_LABELS) {
+	const counts = /* @__PURE__ */ new Map();
+	const visit = (n) => {
+		const label = lossyLabels[n.type];
+		if (label) counts.set(label, (counts.get(label) ?? 0) + 1);
+		for (const child of n.content ?? []) visit(child);
+	};
+	if (node) visit(node);
+	return counts;
 }
-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 formatLossy(counts) {
+	return [...counts.entries()].map(([label, n]) => `${n} ${label}${n === 1 ? "" : "s"}`).join(", ");
 }
-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.`);
+//#endregion
+//#region src/update/body-diff.ts
+const CONTEXT_LINES = 3;
+function unifiedDiff(before, after, labels) {
+	if (before === after) return [];
+	const [from, to] = labels;
+	const patch = structuredPatch(from, to, `${before}\n`, `${after}\n`, void 0, void 0, { context: CONTEXT_LINES });
+	return [
+		`--- ${from}`,
+		`+++ ${to}`,
+		...patch.hunks.flatMap((h) => [`@@ -${h.oldStart},${h.oldLines} +${h.newStart},${h.newLines} @@`, ...h.lines])
+	];
 }
-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 colorDiffLine(line) {
+	if (line.startsWith("+++") || line.startsWith("---")) return kleur.bold(line);
+	if (line.startsWith("@@")) return kleur.cyan(line);
+	if (line.startsWith("+")) return kleur.green(line);
+	if (line.startsWith("-")) return kleur.red(line);
+	return line;
+}
+//#endregion
+//#region src/update/plan.ts
+function planIssueUpdate(source, issue, options) {
+	const images = imageHrefs(source.body).map((href) => ({
+		href,
+		kind: isExternalHref(href) ? "external" : "unsupported"
 	}));
+	const unsupported = images.filter((i) => i.kind === "unsupported").map((i) => i.href);
+	const body = markdownToAdf(source.body, { resolveImage: externalImagesOnly });
+	const refusals = [...unsupported.length > 0 ? [`jira update does not support image changes yet. Remove local image reference(s) or edit text only: ${unsupported.join(", ")}`] : [], ...emptyBodyRefusal(body)];
+	return withVerdict({
+		noun: "issue",
+		id: source.key,
+		headline: headline("summary", issue.summary, source.title, options.summary),
+		revision: revision(source.updatedAtCopy, issue.updated),
+		lossy: findLossyNodes(issue.description, JIRA_LOSSY_LABELS),
+		warnings: htmlWarnings(source.body),
+		diff: [],
+		images,
+		uploads: [],
+		body,
+		refusals
+	}, options.force ?? false);
 }
-function mediaNodeId(a) {
-	return a.fileId ?? a.id;
+function formatPlan(plan) {
+	const lines = [`Dry run for ${plan.noun} ${plan.id} "${plan.headline.current}"`];
+	if (plan.headline.next !== plan.headline.current) lines.push(row(plan.headline.label, `"${plan.headline.current}" -> "${plan.headline.next}"`));
+	const counts = imageCounts(plan.images);
+	if (counts) lines.push(row("images", counts));
+	for (const refusal of plan.refusals) lines.push(row("blocked", refusal));
+	if (plan.lossy.size > 0) lines.push(row("warning", `${formatLossy(plan.lossy)} will be removed`));
+	for (const warning of plan.warnings) lines.push(row("warning", warning));
+	if (plan.revision.stale) lines.push(row("stale", `${revisionText(plan.revision)} (would refuse without --force)`));
+	lines.push(...plan.diff.map(colorDiffLine));
+	lines.push("  nothing was written (dry run)");
+	return lines;
 }
-function withWikiContextPath(link) {
-	if (link.startsWith("http") || link.startsWith("/wiki")) return link;
-	return `/wiki${link}`;
+const IMAGE_COUNT_LABELS = [
+	["upload", "new"],
+	["changed", "changed"],
+	["reuse", "reused"],
+	["external", "external"],
+	["unsupported", "unsupported"],
+	["missing", "missing"]
+];
+function imageCounts(images) {
+	return IMAGE_COUNT_LABELS.map(([kind, label]) => ({
+		n: images.filter((i) => i.kind === kind).length,
+		label
+	})).filter(({ n }) => n > 0).map(({ n, label }) => `${n} ${label}`).join(", ");
+}
+function row(label, value) {
+	return `  ${`${label}:`.padEnd(9)}${value}`;
+}
+function headline(label, current, title, useTitle) {
+	return {
+		label,
+		current,
+		next: useTitle && title ? title : current
+	};
+}
+function revision(local, server) {
+	return {
+		local: local || "unknown",
+		server: server || "unknown",
+		stale: local !== server
+	};
+}
+function revisionText(revision) {
+	return `copied at ${revision.local}, server now ${revision.server}`;
+}
+function externalImagesOnly(href, alt) {
+	return isExternalHref(href) ? externalMedia(href, alt) : void 0;
+}
+function missingImagesRefusal(missing) {
+	return missing.length > 0 ? [`Image file(s) not found: ${missing.join(", ")}`] : [];
+}
+function emptyBodyRefusal(body) {
+	if (body.content && body.content.length > 0) return [];
+	return ["Refusing to update: the converted body is empty."];
+}
+function withVerdict(plan, force) {
+	return {
+		...plan,
+		verdict: verdict(plan, force)
+	};
+}
+function verdict(plan, force) {
+	if (plan.refusals.length > 0) return {
+		kind: "refuse",
+		message: plan.refusals.join("\n")
+	};
+	const noun = plan.noun;
+	if (plan.revision.stale && !force) return {
+		kind: "refuse",
+		message: `${capitalize(noun)} changed on the server since you copied it (${revisionText(plan.revision)}). Re-copy the ${noun} or pass --force.`
+	};
+	if (plan.lossy.size > 0 && !force) return {
+		kind: "confirm",
+		message: `This ${noun} contains ${formatLossy(plan.lossy)} that Markdown cannot represent and will be removed. Continue?`
+	};
+	return { kind: "proceed" };
+}
+function capitalize(text) {
+	return text.charAt(0).toUpperCase() + text.slice(1);
 }
 //#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 ?? "";
+//#region src/update/plan-page.ts
+function planPageBody(page, attachments, localImages) {
+	const collection = `contentId-${page.id}`;
+	const images = imageHrefs(page.body).map((href) => pageImage(href, localImages, attachments));
+	const byHref = new Map(images.map((e) => [e.href, e]));
 	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
+		images,
+		body: markdownToAdf(page.body, { resolveImage: (href, alt) => {
+			const entry = byHref.get(href);
+			if (!entry || entry.kind === "missing") return void 0;
+			if (entry.kind === "external") return externalMedia(href, alt);
+			return mediaNode({
+				type: "file",
+				id: entry.kind === "reuse" ? entry.fileId : href,
+				collection
+			}, alt);
+		} }),
+		uploads: images.flatMap((e) => e.kind === "upload" || e.kind === "changed" ? [{
+			href: e.href,
+			path: e.path,
+			filename: e.filename
+		}] : [])
 	};
 }
-async function fetchPageState(client, id) {
-	const page = await client.getJson(`/wiki/api/v2/pages/${encodeURIComponent(id)}?body-format=atlas_doc_format`);
+function planPageUpdate(source, state, attachments, localImages, options) {
+	const { images, body, uploads } = planPageBody(source, attachments, localImages);
+	const missing = images.filter((e) => e.kind === "missing").map((e) => e.href);
+	return withVerdict({
+		noun: "page",
+		id: source.id,
+		headline: headline("title", state.title, source.title, options.title),
+		revision: revision(`v${source.version}`, `v${state.version}`),
+		lossy: findLossyNodes(state.body),
+		warnings: htmlWarnings(source.body),
+		diff: unifiedDiff(serverMarkdown(state, attachments, images), withoutComments(source.body), [`server v${state.version}`, options.file]),
+		images: images.map(({ href, kind }) => ({
+			href,
+			kind
+		})),
+		uploads,
+		body,
+		refusals: [...missingImagesRefusal(missing), ...emptyBodyRefusal(body)]
+	}, options.force ?? false);
+}
+function serverMarkdown(state, attachments, images) {
+	const reused = new Map(images.flatMap((e) => e.kind === "reuse" ? [[e.fileId, e.href]] : []));
+	return adfToMarkdown(state.body, { resolveMedia: ({ id }) => reused.get(id ?? "") ?? attachments.find((a) => a.fileId === id)?.filename });
+}
+function pageImage(href, localImages, attachments) {
+	if (isExternalHref(href)) return {
+		href,
+		kind: "external"
+	};
+	const local = localImages.find((l) => l.href === href);
+	if (!local || local.size === void 0) return {
+		href,
+		kind: "missing"
+	};
+	const existing = attachments.find((a) => a.filename === local.filename);
+	if (existing && existing.size === local.size) return {
+		href,
+		kind: "reuse",
+		fileId: existing.fileId
+	};
 	return {
-		version: page.version?.number ?? 0,
-		title: page.title,
-		body: parseAdfJson(page.body?.atlas_doc_format?.value)
+		href,
+		kind: existing ? "changed" : "upload",
+		path: local.path,
+		filename: local.filename
 	};
 }
-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
+function withUploadedIds(doc, ids) {
+	if (!doc.content) return doc;
+	return {
+		...doc,
+		content: doc.content.map((n) => withUploadedId(n, ids))
+	};
+}
+function withUploadedId(node, ids) {
+	const id = node.type === "media" ? node.attrs?.["id"] : void 0;
+	const swapped = typeof id === "string" && ids.has(id) ? {
+		...node,
+		attrs: {
+			...node.attrs,
+			id: ids.get(id)
 		}
-	})).version?.number ?? params.nextVersion;
+	} : node;
+	if (!swapped.content) return swapped;
+	return {
+		...swapped,
+		content: swapped.content.map((n) => withUploadedId(n, ids))
+	};
 }
-async function fetchSpaceKey(client, spaceId) {
-	if (!spaceId) return "";
-	try {
-		return (await client.getJson(`/wiki/api/v2/spaces/${encodeURIComponent(spaceId)}`)).key ?? "";
-	} catch {
-		return "";
+//#endregion
+//#region src/commands/confluence-push.ts
+async function pushPage({ session, term, files }, content, push) {
+	const ids = /* @__PURE__ */ new Map();
+	for (const upload of content.uploads) {
+		term.err(`Uploading ${upload.filename} ...`);
+		const bytes = await files.readBytes(upload.path);
+		ids.set(upload.href, await uploadAttachment(session, push.id, upload.filename, bytes));
 	}
+	return updatePage(session, push.id, {
+		title: content.title,
+		nextVersion: push.nextVersion,
+		body: withUploadedIds(content.body, ids),
+		message: push.message
+	});
 }
-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)
-	})));
+async function statLocalImages(files, dir, md) {
+	const hrefs = imageHrefs(md).filter((href) => !isExternalHref(href));
+	return Promise.all(hrefs.map(async (href) => {
+		const path = isAbsolute(href) ? href : resolve(dir, href);
+		return {
+			href,
+			path,
+			filename: basename(path),
+			...await fileSize(files, path)
+		};
+	}));
 }
-function parseAdfJson(value) {
-	if (!value) return null;
+async function fileSize(files, path) {
 	try {
-		return JSON.parse(value);
+		return { size: await files.size(path) };
 	} catch {
-		return null;
+		return {};
 	}
 }
-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;
-const NAMED = {
-	amp: "&",
-	lt: "<",
-	gt: ">",
-	quot: "\"",
-	apos: "'",
-	nbsp: " "
-};
-function decodeEntities(text) {
-	return text.replace(/&(#x?[0-9a-f]+|[a-z]+);/gi, (match, body) => {
-		if (body[0] === "#") {
-			const code = body[1] === "x" || body[1] === "X" ? Number.parseInt(body.slice(2), 16) : Number.parseInt(body.slice(1), 10);
-			return isCodePoint(code) ? String.fromCodePoint(code) : match;
-		}
-		return NAMED[body.toLowerCase()] ?? match;
-	});
-}
-function isCodePoint(code) {
-	return Number.isFinite(code) && code >= 0 && code <= MAX_CODE_POINT;
+//#region src/api/confluence-favourites.ts
+function favouritePath(id) {
+	return `/wiki/rest/api/relation/favourite/from/user/current/to/content/${encodeURIComponent(id)}`;
 }
-//#endregion
-//#region src/api/confluence-search.ts
-async function searchPages(client, site, params) {
-	const cql = buildCql(params);
-	const query = new URLSearchParams({
-		cql,
-		limit: String(params.limit),
-		expand: "space"
-	});
-	const results = (await client.getJson(`/wiki/rest/api/search?${query.toString()}`)).results ?? [];
-	const serverPageWasFull = results.length === params.limit;
-	return {
-		pages: results.filter((r) => r.content?.id).map((r) => ({
-			id: r.content?.id ?? "",
-			space: r.space?.key ?? r.resultGlobalContainer?.title ?? "",
-			title: decodeEntities(r.content?.title ?? r.title ?? ""),
-			updated: r.lastModified ?? "",
-			url: r.url ? `${site}/wiki${r.url}` : ""
-		})),
-		hasMore: serverPageWasFull
-	};
+async function starPage(client, id) {
+	await client.putNoContent(favouritePath(id), void 0);
 }
-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")}"`;
+async function unstarPage(client, id) {
+	await client.deleteNoContent(favouritePath(id));
 }
 //#endregion
 //#region src/commands/resolve-ref.ts
@@ -2227,43 +2594,138 @@ async function resolveRef(ask, arg, kind) {
 	if (!ref) throw new Error(kind.notFound(raw));
 	return ref;
 }
+function layoutOf(raw) {
+	return {
+		bom: raw.startsWith(""),
+		crlf: /\r?\n/.exec(raw)?.[0] === "\r\n"
+	};
+}
+function normalized(raw) {
+	return (raw.startsWith("") ? raw.slice(1) : raw).replace(/\r\n/g, "\n");
+}
+function editKeepingLayout(raw, edit) {
+	return withLayout(edit(normalized(raw)), layoutOf(raw));
+}
+function withLayout(text, layout) {
+	const lines = layout.crlf ? text.replace(/\n/g, "\r\n") : text;
+	return layout.bom ? `${lines}` : lines;
+}
 //#endregion
-//#region src/api/attachments.ts
-function mediaResolver(downloaded) {
-	const byMediaId = new Map(downloaded.map((d) => [d.mediaId, d.relativePath]));
-	const byFilename = new Map(downloaded.map((d) => [d.filename, d.relativePath]));
-	return (media) => {
-		if (media.id && byMediaId.has(media.id)) return byMediaId.get(media.id);
-		if (media.alt && byFilename.has(media.alt)) return byFilename.get(media.alt);
+//#region src/markdown/frontmatter.ts
+const BLOCK = /^---\n([\s\S]*?)\n---\n?/;
+const KEY = /^([A-Za-z0-9_]+):\s*(.*)$/;
+const LIST_ITEM = /^ {2}- (.*)$/;
+const BARE_NUMBER = /^-?\d+(\.\d+)?$/;
+function splitFrontmatter(text) {
+	const match = text.match(BLOCK);
+	if (!match) return null;
+	return {
+		fields: parseFields(match[1] ?? ""),
+		rest: text.slice(match[0].length)
 	};
 }
+function formatFrontmatter(fields) {
+	return [
+		"---",
+		...Object.entries(fields).flatMap(([key, value]) => fieldLines(key, value)),
+		"---"
+	].join("\n");
+}
+function rewriteFields(raw, fields) {
+	return editKeepingLayout(raw, (text) => withFields(text, fields));
+}
+function withFields(text, fields) {
+	const match = text.match(BLOCK);
+	if (!match) return `${formatFrontmatter(fields)}\n\n${text}`;
+	const lines = (match[1] ?? "").split("\n");
+	const pending = new Map(Object.entries(fields));
+	const kept = [];
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i] ?? "";
+		const key = line.match(KEY)?.[1];
+		const value = key === void 0 ? void 0 : pending.get(key);
+		if (key === void 0 || value === void 0) {
+			kept.push(line);
+			continue;
+		}
+		kept.push(...fieldLines(key, value));
+		pending.delete(key);
+		while (LIST_ITEM.test(lines[i + 1] ?? "")) i++;
+	}
+	for (const [key, value] of pending) kept.push(...fieldLines(key, value));
+	const closing = match[0].endsWith("\n") ? "\n" : "";
+	return `---\n${kept.join("\n")}\n---${closing}${text.slice(match[0].length)}`;
+}
+function fieldLines(key, value) {
+	if (Array.isArray(value)) return value.length === 0 ? [`${key}: []`] : [`${key}:`, ...value.map((v) => `  - ${quote$1(v)}`)];
+	return [`${key}: ${typeof value === "number" ? value : quote$1(value)}`];
+}
+function parseFields(block) {
+	const fields = {};
+	const lines = block.split("\n");
+	for (let i = 0; i < lines.length; i++) {
+		const m = lines[i]?.match(KEY);
+		if (!m) continue;
+		const key = m[1] ?? "";
+		const raw = (m[2] ?? "").trim();
+		if (raw === "[]") fields[key] = [];
+		else if (raw === "") {
+			const items = [];
+			for (let item; item = lines[i + 1]?.match(LIST_ITEM); i++) items.push(unquote((item[1] ?? "").trim()));
+			fields[key] = items;
+		} else fields[key] = scalar(raw);
+	}
+	return fields;
+}
+function scalar(raw) {
+	if (raw.startsWith("\"")) return unquote(raw);
+	if (BARE_NUMBER.test(raw)) return Number(raw);
+	return raw;
+}
+function quote$1(value) {
+	return `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
+}
+function unquote(value) {
+	if (!value.startsWith("\"") || !value.endsWith("\"")) return value;
+	return value.slice(1, -1).replace(/\\"/g, "\"").replace(/\\\\/g, "\\");
+}
 //#endregion
 //#region src/markdown/copied-document.ts
+const GENERATED_MARKER = "<!-- atlass:generated -->";
 const COMMENTS_HEADING = "## Comments";
 const ATTACHMENTS_HEADING = "## Attachments";
-const FRONTMATTER_BLOCK = /^---\n([\s\S]*?)\n---\n?/;
-const FRONTMATTER_KEY = /^([A-Za-z0-9_]+):\s*(.*)$/;
-const FRONTMATTER_LIST_ITEM = /^ {2}- (.*)$/;
-const BARE_NUMBER = /^-?\d+(\.\d+)?$/;
-const TRAILING_SECTION_HEADING = /^## (Comments|Attachments)\s*$/;
+const LEGACY_SECTION_HEADING = /^## (Comments|Attachments)\s*$/;
 function render(doc) {
 	return `${[
-		frontmatter(doc.fields),
+		formatFrontmatter(doc.fields),
 		`# ${doc.title}`,
 		doc.body,
+		GENERATED_MARKER,
 		commentsSection(doc.comments),
 		attachmentsSection(doc.attachments)
 	].filter((s) => s.trim().length > 0).join("\n\n")}\n`;
 }
-function parse(text) {
-	const match = text.match(FRONTMATTER_BLOCK);
-	if (!match) throw new Error("Not an atlass file: no YAML frontmatter found.");
-	const fields = parseFrontmatter(match[1] ?? "");
-	const lines = text.slice(match[0].length).split("\n");
+function parse(raw) {
+	const split = splitFrontmatter(normalized(raw));
+	if (!split) throw new Error("Not an atlass file: no YAML frontmatter found.");
+	return sourceOf(split, "marker-or-legacy-heading");
+}
+function parseDraft(raw) {
+	const text = normalized(raw);
+	return sourceOf(splitFrontmatter(text) ?? {
+		fields: {},
+		rest: text
+	}, "marker");
+}
+function withGeneratedMarker(text) {
+	if (text.split("\n").some(isMarker)) return text;
+	return `${text.trimEnd()}\n\n${GENERATED_MARKER}\n`;
+}
+function sourceOf({ fields, rest }, ending) {
+	const lines = rest.split("\n");
 	const h1 = leadingH1(lines);
 	const start = h1 ? h1.index + 1 : 0;
-	const trailing = lines.findIndex((line, i) => i >= start && TRAILING_SECTION_HEADING.test(line));
-	const end = trailing === -1 ? lines.length : trailing;
+	const end = bodyEnd(lines, start, ending);
 	const fallbackTitle = typeof fields["title"] === "string" ? fields["title"] : "";
 	return {
 		fields,
@@ -2299,45 +2761,6 @@ function scalarString(value) {
 	if (typeof value === "number") return String(value);
 	return "";
 }
-function frontmatter(fields) {
-	const lines = ["---"];
-	for (const [key, value] of Object.entries(fields)) if (Array.isArray(value)) {
-		if (value.length === 0) lines.push(`${key}: []`);
-		else lines.push(`${key}:`, ...value.map((v) => `  - ${quote(v)}`));
-	} else if (typeof value === "number") lines.push(`${key}: ${value}`);
-	else lines.push(`${key}: ${quote(value)}`);
-	lines.push("---");
-	return lines.join("\n");
-}
-function parseFrontmatter(block) {
-	const fields = {};
-	const lines = block.split("\n");
-	for (let i = 0; i < lines.length; i++) {
-		const m = lines[i]?.match(FRONTMATTER_KEY);
-		if (!m) continue;
-		const key = m[1] ?? "";
-		const raw = (m[2] ?? "").trim();
-		if (raw === "[]") fields[key] = [];
-		else if (raw === "") {
-			const items = [];
-			for (let item; item = lines[i + 1]?.match(FRONTMATTER_LIST_ITEM); i++) items.push(unquote((item[1] ?? "").trim()));
-			fields[key] = items;
-		} else fields[key] = scalar(raw);
-	}
-	return fields;
-}
-function scalar(raw) {
-	if (raw.startsWith("\"")) return unquote(raw);
-	if (BARE_NUMBER.test(raw)) return Number(raw);
-	return raw;
-}
-function quote(value) {
-	return `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
-}
-function unquote(value) {
-	if (!value.startsWith("\"") || !value.endsWith("\"")) return value;
-	return value.slice(1, -1).replace(/\\"/g, "\"").replace(/\\\\/g, "\\");
-}
 function leadingH1(lines) {
 	for (const [index, line] of lines.entries()) {
 		if (line.startsWith("# ")) return {
@@ -2348,6 +2771,16 @@ function leadingH1(lines) {
 	}
 	return null;
 }
+function bodyEnd(lines, start, ending) {
+	const after = (test) => lines.findIndex((line, i) => i >= start && test(line));
+	const marker = after(isMarker);
+	if (marker !== -1) return marker;
+	const legacy = ending === "marker" ? -1 : after((line) => LEGACY_SECTION_HEADING.test(line));
+	return legacy === -1 ? lines.length : legacy;
+}
+function isMarker(line) {
+	return line.trimEnd() === GENERATED_MARKER;
+}
 function commentsSection(comments) {
 	if (comments.length === 0) return "";
 	const blocks = comments.map((c) => {
@@ -2370,6 +2803,44 @@ function attachmentsSection(attachments) {
 	].join("\n");
 }
 //#endregion
+//#region src/commands/page-ref.ts
+const PAGE_REF = {
+	message: "Confluence page id or URL:",
+	flag: "[page]",
+	parse: parsePageId,
+	notFound: (raw) => `Could not find a page id in "${raw}".`
+};
+async function pageIdOrFile({ term, files }, arg) {
+	if (!arg?.endsWith(".md")) return resolveRef(term.ask, arg, PAGE_REF);
+	const id = scalarString(parse(await files.readText(arg)).fields["id"]);
+	if (!id) throw new Error(`${arg} has no page \`id\` in its frontmatter.`);
+	return id;
+}
+//#endregion
+//#region src/commands/confluence-star.ts
+async function confluenceStar(env, arg) {
+	await starById(env, await pageIdOrFile(env, arg));
+}
+async function starById({ session, term }, id) {
+	await starPage(session, id);
+	term.out(`Starred page ${id}.`);
+}
+async function confluenceUnstar(env, arg) {
+	const id = await pageIdOrFile(env, arg);
+	await unstarPage(env.session, id);
+	env.term.out(`Unstarred page ${id}.`);
+}
+//#endregion
+//#region src/api/attachments.ts
+function mediaResolver(downloaded) {
+	const byMediaId = new Map(downloaded.map((d) => [d.mediaId, d.relativePath]));
+	const byFilename = new Map(downloaded.map((d) => [d.filename, d.relativePath]));
+	return (media) => {
+		if (media.id && byMediaId.has(media.id)) return byMediaId.get(media.id);
+		if (media.alt && byFilename.has(media.alt)) return byFilename.get(media.alt);
+	};
+}
+//#endregion
 //#region src/copy/plan.ts
 function planIssueCopy(issue, out) {
 	return planCopy({
@@ -2392,19 +2863,22 @@ function planIssueCopy(issue, out) {
 		attachments: issue.attachments
 	}, out);
 }
+function pageFields(page) {
+	return {
+		title: page.title,
+		id: page.id,
+		space: page.spaceKey,
+		version: page.version,
+		author: page.author,
+		created: page.createdAt,
+		updated: page.updatedAt,
+		url: page.url
+	};
+}
 function planPageCopy(page, out) {
 	return planCopy({
 		baseName: `${page.id}-${slugify(page.title)}`,
-		fields: {
-			title: page.title,
-			id: page.id,
-			space: page.spaceKey,
-			version: page.version,
-			author: page.author,
-			created: page.createdAt,
-			updated: page.updatedAt,
-			url: page.url
-		},
+		fields: pageFields(page),
 		title: page.title,
 		body: page.body,
 		comments: page.comments,
@@ -2475,246 +2949,235 @@ function numberedName(name, suffix) {
 	return `${dot > 0 ? name.slice(0, dot) : name}-${suffix}${dot > 0 ? name.slice(dot) : ""}`;
 }
 //#endregion
-//#region src/copy/run.ts
-async function runCopy(env, plan) {
-	const landed = await download(env, plan);
-	await env.files.writeText(plan.filePath, renderCopy(plan, landed));
-	env.term.out(wroteLine(plan.filePath, landed.length));
-}
-async function download({ term, files, session }, plan) {
-	const landed = [];
-	for (const { path, ...attachment } of plan.downloads) try {
-		await files.writeBytes(path, await session.getBinary(attachment.url));
-		landed.push(attachment);
-	} catch (err) {
-		term.err(`  ! could not download ${attachment.filename}: ${err.message}`);
-	}
-	return landed;
-}
-function wroteLine(filePath, attachmentCount) {
-	return `Wrote ${filePath}${attachmentCount > 0 ? ` (+${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"})` : ""}`;
-}
-//#endregion
-//#region src/adf/lossy.ts
-const LOSSY_LABELS = {
-	panel: "panel",
-	expand: "expand",
-	nestedExpand: "expand",
-	decisionList: "decision list",
-	layoutSection: "layout",
-	extension: "macro",
-	bodiedExtension: "macro",
-	inlineExtension: "macro"
-};
-const JIRA_LOSSY_LABELS = {
-	...LOSSY_LABELS,
-	media: "image",
-	mediaInline: "image"
-};
-function findLossyNodes(node, lossyLabels = LOSSY_LABELS) {
-	const counts = /* @__PURE__ */ new Map();
-	const visit = (n) => {
-		const label = lossyLabels[n.type];
-		if (label) counts.set(label, (counts.get(label) ?? 0) + 1);
-		for (const child of n.content ?? []) visit(child);
-	};
-	if (node) visit(node);
-	return counts;
-}
-function formatLossy(counts) {
-	return [...counts.entries()].map(([label, n]) => `${n} ${label}${n === 1 ? "" : "s"}`).join(", ");
-}
-//#endregion
-//#region src/update/plan.ts
-function planIssueUpdate(source, issue, options) {
-	const images = imageHrefs(source.body).map((href) => ({
+//#region src/create/page-plan.ts
+function planPageCreate(draft, target, localImages) {
+	const images = imageHrefs(draft.body).map((href) => ({
 		href,
-		kind: isExternalHref(href) ? "external" : "unsupported"
-	}));
-	const unsupported = images.filter((i) => i.kind === "unsupported").map((i) => i.href);
-	const body = markdownToAdf(source.body, { resolveImage: (href, alt) => isExternalHref(href) ? externalMedia(href, alt) : void 0 });
-	const refusals = [...unsupported.length > 0 ? [`jira update does not support image changes yet. Remove local image reference(s) or edit text only: ${unsupported.join(", ")}`] : [], ...emptyBodyRefusal(body)];
-	return withVerdict({
-		noun: "issue",
-		id: source.key,
-		headline: headline("summary", issue.summary, source.title, options.summary),
-		revision: revision(source.updatedAtCopy, issue.updated),
-		lossy: findLossyNodes(issue.description, JIRA_LOSSY_LABELS),
-		images,
-		uploads: [],
-		body,
-		refusals
-	}, options.force ?? false);
-}
-function formatPlan(plan) {
-	const lines = [`Dry run for ${plan.noun} ${plan.id} "${plan.headline.current}"`];
-	if (plan.headline.next !== plan.headline.current) lines.push(row(plan.headline.label, `"${plan.headline.current}" -> "${plan.headline.next}"`));
-	const counts = imageCounts(plan.images);
-	if (counts) lines.push(row("images", counts));
-	for (const refusal of plan.refusals) lines.push(row("blocked", refusal));
-	if (plan.lossy.size > 0) lines.push(row("warning", `${formatLossy(plan.lossy)} will be removed`));
-	if (plan.revision.stale) lines.push(row("stale", `${revisionText(plan.revision)} (would refuse without --force)`));
-	lines.push("  nothing was written (dry run)");
-	return lines;
-}
-const IMAGE_COUNT_LABELS = [
-	["upload", "new"],
-	["changed", "changed"],
-	["reuse", "reused"],
-	["external", "external"],
-	["unsupported", "unsupported"],
-	["missing", "missing"]
-];
-function imageCounts(images) {
-	return IMAGE_COUNT_LABELS.map(([kind, label]) => ({
-		n: images.filter((i) => i.kind === kind).length,
-		label
-	})).filter(({ n }) => n > 0).map(({ n, label }) => `${n} ${label}`).join(", ");
-}
-function row(label, value) {
-	return `  ${`${label}:`.padEnd(9)}${value}`;
-}
-function headline(label, current, title, useTitle) {
-	return {
-		label,
-		current,
-		next: useTitle && title ? title : current
-	};
-}
-function revision(local, server) {
+		kind: imageKind(href, localImages)
+	}));
+	const missing = images.filter((i) => i.kind === "missing").map((i) => i.href);
 	return {
-		local: local || "unknown",
-		server: server || "unknown",
-		stale: local !== server
+		...target,
+		title: draft.title,
+		images,
+		body: markdownToAdf(draft.body, { resolveImage: externalImagesOnly }),
+		warnings: htmlWarnings(draft.body),
+		refusals: [
+			...draft.title ? [] : ["No title. Add an H1 or a `title` to the frontmatter."],
+			...spaceRefusal(target),
+			...missingImagesRefusal(missing)
+		]
 	};
 }
-function revisionText(revision) {
-	return `copied at ${revision.local}, server now ${revision.server}`;
+function formatCreatePlan(plan) {
+	const lines = [`Dry run for new page "${plan.title}"`];
+	if (plan.spaceId) lines.push(row("space", plan.space));
+	lines.push(row("parent", plan.parentId ?? "space homepage"));
+	const counts = imageCounts(plan.images);
+	if (counts) lines.push(row("images", counts));
+	for (const refusal of plan.refusals) lines.push(row("blocked", refusal));
+	for (const warning of plan.warnings) lines.push(row("warning", warning));
+	lines.push("  nothing was written (dry run)");
+	return lines;
 }
-function emptyBodyRefusal(body) {
-	if (body.content && body.content.length > 0) return [];
-	return ["Refusing to update: the converted body is empty."];
+function imageKind(href, localImages) {
+	if (isExternalHref(href)) return "external";
+	return localImages.find((l) => l.href === href)?.size === void 0 ? "missing" : "upload";
 }
-function withVerdict(plan, force) {
-	return {
-		...plan,
-		verdict: verdict(plan, force)
-	};
+function spaceRefusal({ space, spaceId }) {
+	if (!space) return ["No space. Pass --space or add `space` to the frontmatter."];
+	return spaceId ? [] : [`Space "${space}" not found.`];
 }
-function verdict(plan, force) {
-	if (plan.refusals.length > 0) return {
-		kind: "refuse",
-		message: plan.refusals.join("\n")
-	};
-	const noun = plan.noun;
-	if (plan.revision.stale && !force) return {
-		kind: "refuse",
-		message: `${capitalize(noun)} changed on the server since you copied it (${revisionText(plan.revision)}). Re-copy the ${noun} or pass --force.`
-	};
-	if (plan.lossy.size > 0 && !force) return {
-		kind: "confirm",
-		message: `This ${noun} contains ${formatLossy(plan.lossy)} that Markdown cannot represent and will be removed. Continue?`
+//#endregion
+//#region src/commands/confluence-create.ts
+async function confluenceCreate(env, arg, options) {
+	const { session, term, files } = env;
+	const file = arg ?? await term.ask.text({
+		message: "Path to the Markdown file:",
+		flag: "[file]",
+		required: true
+	});
+	const raw = await files.readText(file);
+	const draft = parseDraft(raw);
+	const existing = scalarString(draft.fields["id"]);
+	if (existing) throw new Error(`${file} already has page id ${existing}. Use \`atlass confluence update\` instead.`);
+	const parent = parentOf(options.parent);
+	const space = options.space ?? scalarString(draft.fields["space"]);
+	const spaceId = space ? await findSpaceId(session, space) : null;
+	const localImages = await statLocalImages(files, dirname(resolve(file)), draft.body);
+	const plan = planPageCreate(draft, {
+		space,
+		spaceId,
+		...parent
+	}, localImages);
+	if (options.dryRun) term.out(formatCreatePlan(plan));
+	if (plan.refusals.length > 0 || !plan.spaceId) throw new Error(plan.refusals.join("\n"));
+	if (options.dryRun) return;
+	for (const warning of plan.warnings) term.err(`warning: ${warning}`);
+	const created = await createPage(session, {
+		...plan,
+		spaceId: plan.spaceId
+	});
+	const createdFields = {
+		title: plan.title,
+		id: created.id,
+		space,
+		version: created.version
 	};
-	return { kind: "proceed" };
+	await files.writeText(file, editKeepingLayout(raw, (text) => withGeneratedMarker(withFields(text, createdFields))));
+	if (plan.images.some((i) => i.kind === "upload")) await addImages(env, draft, created, localImages);
+	const page = await fetchPage(session, session.site, created.id);
+	await files.writeText(file, rewriteFields(await files.readText(file), pageFields(page)));
+	term.out(`Created page ${page.id} in ${page.spaceKey}: ${page.url}`);
+	if (options.star) await starCreated(env, page.id, file);
+}
+function parentOf(parent) {
+	if (parent === void 0) return {};
+	const parentId = parsePageId(parent);
+	if (!parentId) throw new Error(`Could not find a page id in --parent "${parent}".`);
+	return { parentId };
+}
+async function addImages(env, draft, created, localImages) {
+	const { body, uploads } = planPageBody({
+		id: created.id,
+		body: draft.body
+	}, [], localImages);
+	await pushPage(env, {
+		title: draft.title,
+		body,
+		uploads
+	}, {
+		id: created.id,
+		nextVersion: created.version + 1,
+		message: "Added images via atlass"
+	});
 }
-function capitalize(text) {
-	return text.charAt(0).toUpperCase() + text.slice(1);
+async function starCreated(env, id, file) {
+	try {
+		await starById(env, id);
+	} catch (err) {
+		const reason = err instanceof Error ? err.message : String(err);
+		throw new Error(`Created page ${id} but could not star it: ${reason}. Run \`atlass confluence star ${file}\`.`);
+	}
 }
 //#endregion
-//#region src/update/plan-page.ts
-function planPageUpdate(source, state, attachments, localImages, options) {
-	const collection = `contentId-${source.id}`;
-	const entries = imageHrefs(source.body).map((href) => pageImage(href, localImages, attachments));
-	const byHref = new Map(entries.map((e) => [e.href, e]));
-	const body = markdownToAdf(source.body, { resolveImage: (href, alt) => {
-		const entry = byHref.get(href);
-		if (!entry || entry.kind === "missing") return void 0;
-		if (entry.kind === "external") return externalMedia(href, alt);
-		return mediaNode({
-			type: "file",
-			id: entry.kind === "reuse" ? entry.fileId : href,
-			collection
-		}, alt);
-	} });
-	const missing = entries.filter((e) => e.kind === "missing").map((e) => e.href);
-	const refusals = [...missing.length > 0 ? [`Image file(s) not found: ${missing.join(", ")}`] : [], ...emptyBodyRefusal(body)];
-	return withVerdict({
-		noun: "page",
-		id: source.id,
-		headline: headline("title", state.title, source.title, options.title),
-		revision: revision(`v${source.version}`, `v${state.version}`),
-		lossy: findLossyNodes(state.body),
-		images: entries.map(({ href, kind }) => ({
-			href,
-			kind
-		})),
-		uploads: entries.flatMap((e) => e.kind === "upload" || e.kind === "changed" ? [{
-			href: e.href,
-			path: e.path,
-			filename: e.filename
-		}] : []),
-		body,
-		refusals
-	}, options.force ?? false);
+//#region src/api/query.ts
+function quote(value) {
+	return `"${value.replace(/(["\\])/g, "\\$1")}"`;
 }
-function pageImage(href, localImages, attachments) {
-	if (isExternalHref(href)) return {
-		href,
-		kind: "external"
-	};
-	const local = localImages.find((l) => l.href === href);
-	if (!local || local.size === void 0) return {
-		href,
-		kind: "missing"
-	};
-	const existing = attachments.find((a) => a.filename === local.filename);
-	if (existing && existing.size === local.size) return {
-		href,
-		kind: "reuse",
-		fileId: existing.fileId
-	};
-	return {
-		href,
-		kind: existing ? "changed" : "upload",
-		path: local.path,
-		filename: local.filename
-	};
+function values(given) {
+	return (given ?? []).map((v) => v.trim()).filter((v) => v.length > 0);
 }
-function withUploadedIds(doc, ids) {
-	if (!doc.content) return doc;
-	return {
-		...doc,
-		content: doc.content.map((n) => withUploadedId(n, ids))
-	};
+function inClause(field, given) {
+	return renderClause(field, values(given).map(quote));
 }
-function withUploadedId(node, ids) {
-	const id = node.type === "media" ? node.attrs?.["id"] : void 0;
-	const swapped = typeof id === "string" && ids.has(id) ? {
-		...node,
-		attrs: {
-			...node.attrs,
-			id: ids.get(id)
+function userClause(field, given) {
+	return renderClause(field, values(given).map((v) => v === "me" ? "currentUser()" : quote(v)));
+}
+function renderClause(field, rendered) {
+	if (rendered.length === 0) return null;
+	if (rendered.length === 1) return `${field} = ${rendered[0]}`;
+	return `${field} in (${rendered.join(", ")})`;
+}
+function joinClauses(clauses, order) {
+	return `${clauses.filter((c) => c !== null).join(" AND ")} ORDER BY ${order}`;
+}
+//#endregion
+//#region src/util/html.ts
+const MAX_CODE_POINT = 1114111;
+const NAMED = {
+	amp: "&",
+	lt: "<",
+	gt: ">",
+	quot: "\"",
+	apos: "'",
+	nbsp: " "
+};
+function decodeEntities(text) {
+	return text.replace(/&(#x?[0-9a-f]+|[a-z]+);/gi, (match, body) => {
+		if (body[0] === "#") {
+			const code = body[1] === "x" || body[1] === "X" ? Number.parseInt(body.slice(2), 16) : Number.parseInt(body.slice(1), 10);
+			return isCodePoint(code) ? String.fromCodePoint(code) : match;
 		}
-	} : node;
-	if (!swapped.content) return swapped;
+		return NAMED[body.toLowerCase()] ?? match;
+	});
+}
+function isCodePoint(code) {
+	return Number.isFinite(code) && code >= 0 && code <= MAX_CODE_POINT;
+}
+//#endregion
+//#region src/api/confluence-search.ts
+async function searchPages(client, site, params) {
+	return searchPagesByCql(client, site, buildCql(params), params.limit);
+}
+async function searchPagesByCql(client, site, cql, limit) {
+	const query = new URLSearchParams({
+		cql,
+		limit: String(limit),
+		expand: "content.space"
+	});
+	const results = (await client.getJson(`/wiki/rest/api/search?${query.toString()}`)).results ?? [];
+	const serverPageWasFull = results.length === limit;
 	return {
-		...swapped,
-		content: swapped.content.map((n) => withUploadedId(n, ids))
+		pages: results.filter((r) => r.content?.id).map((r) => ({
+			id: r.content?.id ?? "",
+			space: r.content?.space?.key ?? spaceKeyOf(r.resultGlobalContainer?.displayUrl),
+			title: decodeEntities(r.content?.title ?? r.title ?? ""),
+			updated: r.lastModified ?? "",
+			url: r.url ? `${site}/wiki${r.url}` : ""
+		})),
+		hasMore: serverPageWasFull
 	};
 }
+const SPACE_URL = /\/spaces\/([^/?#]+)/;
+function spaceKeyOf(displayUrl) {
+	return SPACE_URL.exec(displayUrl ?? "")?.[1] ?? "";
+}
+function buildCql(params) {
+	return joinClauses([
+		"type = page",
+		params.starred ? "favourite = currentUser()" : null,
+		inClause("space", params.space),
+		inClause("label", params.label),
+		params.updatedSince ? `lastmodified >= ${quote(params.updatedSince)}` : null,
+		params.text ? `text ~ ${quote(params.text)}` : null
+	], "lastmodified DESC");
+}
+//#endregion
+//#region src/copy/run.ts
+async function runCopy(env, plan) {
+	const landed = await download(env, plan);
+	await env.files.writeText(plan.filePath, renderCopy(plan, landed));
+	env.term.out(wroteLine(plan.filePath, landed.length));
+}
+async function download({ term, files, session }, plan) {
+	const landed = [];
+	for (const { path, ...attachment } of plan.downloads) try {
+		await files.writeBytes(path, await session.getBinary(attachment.url));
+		landed.push(attachment);
+	} catch (err) {
+		term.err(`  ! could not download ${attachment.filename}: ${err.message}`);
+	}
+	return landed;
+}
+function wroteLine(filePath, attachmentCount) {
+	return `Wrote ${filePath}${attachmentCount > 0 ? ` (+${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"})` : ""}`;
+}
 //#endregion
 //#region src/update/run.ts
 async function runPlan(term, plan, options, push) {
+	const verdict = plan.verdict;
 	if (options.dryRun) {
 		term.out(formatPlan(plan));
+		if (verdict.kind === "refuse") throw new Error(verdict.message);
+		if (verdict.kind === "confirm" && !term.interactive) throw new NotInteractiveError(forcePrompt(verdict.message));
 		return;
 	}
-	const verdict = plan.verdict;
+	for (const warning of plan.warnings) term.err(`warning: ${warning}`);
 	if (verdict.kind === "refuse") throw new Error(verdict.message);
 	if (verdict.kind === "confirm") {
 		if (!await term.ask.confirm({
-			message: verdict.message,
-			flag: "--force",
+			...forcePrompt(verdict.message),
 			default: false
 		})) {
 			term.out("Aborted.");
@@ -2723,6 +3186,12 @@ async function runPlan(term, plan, options, push) {
 	}
 	await push();
 }
+function forcePrompt(message) {
+	return {
+		message,
+		flag: "--force"
+	};
+}
 //#endregion
 //#region src/commands/confluence.ts
 async function confluenceView({ session, term }, arg, options) {
@@ -2733,7 +3202,7 @@ async function confluenceView({ session, term }, arg, options) {
 function formatPageView(page, nowMs, allComments) {
 	return [
 		kleur.bold(page.title),
-		...fieldLines([
+		...fieldLines$1([
 			["Space", page.spaceKey],
 			["ID", page.id],
 			["Version", page.version ? String(page.version) : ""],
@@ -2750,79 +3219,80 @@ function formatPageView(page, nowMs, allComments) {
 async function confluenceCopy(env, arg, options) {
 	await copyPage(env, await resolveRef(env.term.ask, arg, PAGE_REF), options.out);
 }
-async function confluenceUpdate({ session, term, files }, arg, options) {
+async function confluenceUpdate(env, arg, options) {
+	const { session, term, files } = env;
 	const file = arg ?? await term.ask.text({
 		message: "Path to the page Markdown file:",
 		flag: "[file]",
 		required: true
 	});
-	const src = parsePageSource(await files.readText(file));
+	const raw = await files.readText(file);
+	const src = parsePageSource(raw);
 	const state = await fetchPageState(session, src.id);
-	const plan = planPageUpdate(src, state, await listAttachments(session, src.id), await statLocalImages(files, dirname(resolve(file)), src.body), options);
+	const plan = planPageUpdate(src, state, await listAttachments(session, src.id), await statLocalImages(files, dirname(resolve(file)), src.body), {
+		...options,
+		file
+	});
 	await runPlan(term, plan, options, async () => {
-		const ids = /* @__PURE__ */ new Map();
-		for (const upload of plan.uploads) {
-			term.err(`Uploading ${upload.filename} ...`);
-			const bytes = await files.readBytes(upload.path);
-			ids.set(upload.href, await uploadAttachment(session, src.id, upload.filename, bytes));
-		}
-		const version = await updatePage(session, src.id, {
+		const version = await pushPage(env, {
 			title: plan.headline.next,
+			body: plan.body,
+			uploads: plan.uploads
+		}, {
+			id: src.id,
 			nextVersion: state.version + 1,
-			body: withUploadedIds(plan.body, ids),
 			message: options.message ?? "Updated via atlass"
 		});
-		term.out(`Updated page ${src.id} to version ${version}.`);
+		term.out(`Updated page ${src.id} to version ${version.number}.`);
+		await files.writeText(file, rewriteFields(raw, pushedFields(plan, version)));
 	});
 }
-async function statLocalImages(files, dir, md) {
-	const hrefs = imageHrefs(md).filter((href) => !isExternalHref(href));
-	return Promise.all(hrefs.map(async (href) => {
-		const path = isAbsolute(href) ? href : resolve(dir, href);
-		return {
-			href,
-			path,
-			filename: basename(path),
-			...await fileSize(files, path)
-		};
-	}));
+function pushedFields(plan, version) {
+	const fields = { version: version.number };
+	if (version.createdAt) fields["updated"] = version.createdAt;
+	if (plan.headline.next !== plan.headline.current) fields["title"] = plan.headline.next;
+	return fields;
 }
-async function fileSize(files, path) {
-	try {
-		return { size: await files.size(path) };
-	} catch {
-		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));
 }
+//#endregion
+//#region src/commands/confluence-search.ts
 async function confluenceSearch(env, query, options) {
-	if (options.cql && (query || options.space)) throw new Error("--cql cannot be combined with a text query or --space.");
 	await listPages(env, {
 		text: query,
 		space: options.space,
-		cql: options.cql
+		label: options.label,
+		starred: options.starred,
+		updatedSince: options.updated ? parseSince(options.updated, Date.now()) : void 0
 	}, "No matching pages.", options);
 }
 async function confluenceList(env, options) {
 	await listPages(env, {
 		starred: true,
-		space: options.space
+		space: options.space ? [options.space] : void 0
 	}, options.space ? `No starred pages in ${options.space}.` : "No starred pages.", options);
 }
+async function confluenceCql(env, query, options) {
+	const limit = checkedLimit(options);
+	const { pages, hasMore } = await searchPagesByCql(env.session, env.session.site, query, limit);
+	await showPages(env, pages, hasMore, limit, options);
+}
 async function listPages(env, filter, empty, options) {
-	const { session, term } = env;
-	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
-	const limit = parseLimit(options.limit);
-	const { pages, hasMore } = await searchPages(session, session.site, {
+	const limit = checkedLimit(options);
+	const { pages, hasMore } = await searchPages(env.session, env.session.site, {
 		...filter,
 		limit
 	});
-	await runSearch(term, formatPageRows(pages, Date.now()), {
-		json: options.json,
-		copy: options.copy,
-		out: options.out,
+	await showPages(env, pages, hasMore, limit, options, empty);
+}
+async function showPages(env, pages, hasMore, limit, options, empty = "No matching pages.") {
+	await showRows(env.term, formatPageRows(pages, Date.now()), {
 		empty,
-		footer: hasMore ? searchFooter(limit) : void 0
-	}, PAGE_NOUN, (id) => copyPage(env, id, options.out));
+		hasMore,
+		limit
+	}, options, PAGE_NOUN, (id) => copyPage(env, id, options.out));
 }
 function formatPageRows(pages, nowMs) {
 	return alignedRows(pages, nowMs, (p) => ({
@@ -2850,16 +3320,6 @@ const PAGE_NOUN = {
 	singular: "page",
 	plural: "pages"
 };
-async function copyPage(env, id, out) {
-	env.term.err(`Fetching page ${id} ...`);
-	await runCopy(env, planPageCopy(await fetchPage(env.session, env.session.site, id), out));
-}
-const PAGE_REF = {
-	message: "Confluence page id or URL:",
-	flag: "[page]",
-	parse: parsePageId,
-	notFound: (raw) => `Could not find a page id in "${raw}".`
-};
 //#endregion
 //#region src/cli/confluence.ts
 function registerConfluence(confluence) {
@@ -2867,8 +3327,12 @@ 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));
+	confluence.command("create [file]").description("Create a Confluence page from a Markdown file").option("-s, --space <key>", "space to create it in (default: the frontmatter space)").option("--parent <page>", "parent page id or URL (default: the space homepage)").option("--star", "star the new page").option("--dry-run", "show what would be created without writing").action(jiraAction(confluenceCreate));
+	confluence.command("star [page]").description("Star a Confluence page (id, URL, or copied file)").action(jiraAction(confluenceStar));
+	confluence.command("unstar [page]").description("Unstar a Confluence page (id, URL, or copied file)").action(jiraAction(confluenceUnstar));
+	outputOptions(confluence.command("list").description("List pages you starred").option("-s, --space <key>", "limit to a space")).action(jiraAction(confluenceList));
+	outputOptions(confluence.command("search [query]").description("Search Confluence pages by text and filters").option("-s, --space <key>", "limit to a space (repeatable)", collect).option("--label <label>", "limit to a label (repeatable)", collect).option("--starred", "limit to pages you starred").option("-u, --updated <when>", "changed since 7d, 2w, 3m, or YYYY-MM-DD").addOption(moved("--cql <cql>", "confluence cql"))).action(jiraAction(confluenceSearch));
+	outputOptions(confluence.command("cql <query>").description("Search Confluence pages with a raw CQL query")).action(jiraAction(confluenceCql));
 	return confluence;
 }
 //#endregion
@@ -2937,6 +3401,24 @@ async function searchAssignableUsers(client, project, query) {
 	});
 	return (await client.getJson(`/rest/api/3/user/assignable/search?${params.toString()}`)).map(toJiraUser);
 }
+const ACCOUNT_ID = /^(?:[0-9a-z]{24}|[a-z0-9]+:[0-9a-f-]{36}(?::[0-9a-f-]{36})?)$/i;
+async function searchUsers(client, query) {
+	const params = new URLSearchParams({
+		query,
+		maxResults: "20"
+	});
+	return (await client.getJson(`/rest/api/3/user/search?${params.toString()}`)).map(toJiraUser);
+}
+function matchUser(users, query, noun) {
+	const active = users.filter((u) => u.active);
+	const needle = query.toLowerCase();
+	const exact = active.filter((u) => u.displayName.toLowerCase() === needle || u.email.toLowerCase() === needle);
+	const candidates = exact.length === 1 ? exact : active;
+	if (candidates.length === 1) return candidates[0].accountId;
+	if (candidates.length === 0) throw new Error(`no ${noun} matches "${query}".`);
+	const names = candidates.map((u) => u.displayName).join(", ");
+	throw new Error(`"${query}" matches ${candidates.length} users: ${names}.`);
+}
 async function fetchMyself(client) {
 	return toJiraUser(await client.getJson("/rest/api/3/myself"));
 }
@@ -3014,18 +3496,11 @@ function matchType(types, arg) {
 	const needle = arg.trim().toLowerCase();
 	return types.find((t) => t.id === arg.trim()) ?? types.find((t) => t.name.toLowerCase() === needle);
 }
-const ACCOUNT_ID = /^(?:[0-9a-f]{24}|[a-z0-9]+:[0-9a-f-]{36}(?::[0-9a-f-]{36})?)$/i;
 function userResolver(client, project) {
 	return async (query) => {
 		if (query === "me") return (await fetchMyself(client)).accountId;
 		if (ACCOUNT_ID.test(query)) return query;
-		const users = (await searchAssignableUsers(client, project, query)).filter((u) => u.active);
-		const exact = users.filter((u) => u.displayName.toLowerCase() === query.toLowerCase() || u.email.toLowerCase() === query.toLowerCase());
-		const candidates = exact.length === 1 ? exact : users;
-		if (candidates.length === 1) return candidates[0].accountId;
-		if (candidates.length === 0) throw new Error(`no assignable user matches "${query}".`);
-		const names = candidates.map((u) => u.displayName).join(", ");
-		throw new Error(`"${query}" matches ${candidates.length} users: ${names}.`);
+		return matchUser(await searchAssignableUsers(client, project, query), query, "assignable user");
 	};
 }
 //#endregion
@@ -3639,9 +4114,13 @@ async function jiraFields({ session, term }, projectArg, typeArg, options) {
 //#endregion
 //#region src/api/jira-search.ts
 const RECENT_ISSUES_CLAUSE = "updated >= -30d";
+const OPEN_CLAUSE = "statusCategory != Done";
 const SEARCH_FIELDS = "summary,status,updated";
 async function searchIssues(client, site, params) {
-	return ((await fetchSearchPage(client, buildJql(params), params.limit)).issues ?? []).map((i) => toIssueSummary(site, i));
+	return searchIssuesByJql(client, site, buildJql(params), params.limit);
+}
+async function searchIssuesByJql(client, site, jql, limit) {
+	return ((await fetchSearchPage(client, jql, limit)).issues ?? []).map((i) => toIssueSummary(site, i));
 }
 async function fetchSearchPage(client, jql, maxResults, nextPageToken) {
 	const query = new URLSearchParams({
@@ -3662,22 +4141,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(params.updatedSince)}` : null,
+		params.text ? `text ~ ${quote(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(params.project)}` : null,
+		params.all ? `(${OPEN_CLAUSE} OR ${RECENT_ISSUES_CLAUSE})` : OPEN_CLAUSE
+	], ISSUE_ORDER);
 }
 const LIST_PAGE_SIZE = 100;
 const LIST_CAP = 500;
@@ -3712,8 +4197,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
@@ -3759,7 +4295,9 @@ async function fetchIssue(client, site, key) {
 async function updateIssue(client, key, update) {
 	const fields = { description: update.description };
 	if (update.summary !== void 0) fields["summary"] = update.summary;
-	await client.putNoContent(`/rest/api/3/issue/${encodeURIComponent(key)}`, { fields });
+	const path = `/rest/api/3/issue/${encodeURIComponent(key)}`;
+	await client.putNoContent(path, { fields });
+	return (await client.getJson(`${path}?fields=updated`)).fields.updated ?? "";
 }
 async function fetchComments(client, key) {
 	return (await client.getJson(`/rest/api/3/issue/${encodeURIComponent(key)}/comment?maxResults=100&orderBy=created`)).comments.map((c) => ({
@@ -3851,7 +4389,7 @@ function formatIssueView(issue, nowMs, allComments) {
 	const colorStatus = colorForCategory(issue.statusCategory);
 	return [
 		`${kleur.bold(issue.key)}  ${issue.summary}`,
-		...fieldLines([
+		...fieldLines$1([
 			["Type", issue.type],
 			["Status", issue.status && colorStatus(issue.status)],
 			["Assignee", issue.assignee],
@@ -3876,15 +4414,17 @@ async function jiraUpdate({ session, term, files }, arg, options) {
 		flag: "[file]",
 		required: true
 	});
-	const src = parseIssueSource(await files.readText(file));
+	const raw = await files.readText(file);
+	const src = parseIssueSource(raw);
 	const plan = planIssueUpdate(src, await fetchIssue(session, session.site, src.key), options);
 	await runPlan(term, plan, options, async () => {
 		const { current, next } = plan.headline;
-		await updateIssue(session, src.key, {
+		const updated = await updateIssue(session, src.key, {
 			description: plan.body,
 			summary: next !== current ? next : void 0
 		});
 		term.out(`Updated ${src.key}.`);
+		if (updated) await files.writeText(file, rewriteFields(raw, { updated }));
 	});
 }
 async function copyIssue(env, key, out) {
@@ -3900,29 +4440,29 @@ const ISSUE_REF = {
 //#endregion
 //#region src/commands/jira-search.ts
 async function jiraSearch(env, query, options) {
-	const { session, term } = env;
-	if (options.jql && (query || options.project || options.assignee || options.status)) throw new Error("--jql cannot be combined with a text query or other filters.");
-	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
-	const limit = parseLimit(options.limit);
-	const issues = await searchIssues(session, session.site, {
-		text: query,
-		project: options.project,
-		assignee: options.assignee,
-		status: options.status,
-		jql: options.jql,
+	const { session } = env;
+	checkQuery(query, options);
+	const limit = checkedLimit(options);
+	const params = await searchParams(session, query, options, limit, Date.now());
+	await showIssues(env, await searchIssues(session, session.site, params).catch((err) => {
+		throw searchHint(err, options.project);
+	}), limit, options);
+}
+async function jiraJql(env, query, options) {
+	const { session } = env;
+	const limit = checkedLimit(options);
+	await showIssues(env, await searchIssuesByJql(session, session.site, query, limit), limit, options);
+}
+async function showIssues(env, issues, limit, options, empty = "No matching issues.") {
+	await showRows(env.term, formatIssueRows(issues, Date.now()), {
+		empty,
+		hasMore: issues.length === limit,
 		limit
-	});
-	await runSearch(term, formatIssueRows(issues, Date.now()), {
-		json: options.json,
-		copy: options.copy,
-		out: options.out,
-		empty: "No matching issues.",
-		footer: issues.length === limit ? searchFooter(limit) : void 0
-	}, ISSUE_NOUN, (key) => copyIssue(env, key, options.out));
+	}, options, ISSUE_NOUN, (key) => copyIssue(env, key, options.out));
 }
 async function jiraList(env, options) {
 	const { session, term } = env;
-	if (options.json && options.copy) throw new Error("--json and --copy cannot be used together.");
+	checkedLimit(options);
 	const { issues, truncated } = await listAssignedIssues(session, session.site, {
 		all: options.all,
 		project: options.project
@@ -3951,25 +4491,23 @@ const ISSUE_NOUN = {
 };
 //#endregion
 //#region src/cli/jira.ts
-function collect(value, previous = []) {
-	return [...previous, value];
-}
 function registerJira(jira) {
 	jira.description("Jira commands");
 	jira.command("projects [query]").description("List projects (optionally filtered by key or name)").option("--json", "output results as JSON").action(jiraAction(jiraProjects));
 	jira.command("statuses [query]").description("List statuses (optionally filtered by name, scoped with --project)").option("-p, --project <key>", "limit to statuses used by a project").option("--json", "output results as JSON").action(jiraAction(jiraStatuses));
-	jira.command("create [project] [type]").description("Create a Jira issue, prompting for fields or taking them all as flags").option("-s, --summary <text>", "issue summary").option("-d, --description <markdown>", "description as Markdown").option("--description-file <path>", "read the description from a Markdown file").option("-a, --assignee <who>", "assignee: me, an account id, or a name to look up").option("--priority <name>", "priority name").option("-l, --label <label>", "label (repeatable, or comma separated)", collect).option("-c, --component <name>", "component (repeatable, or comma separated)", collect).option("--parent <key>", "parent issue key for subtasks").option("-f, --field <name=value>", "any other create-screen field (repeatable)", collect).option("--dry-run", "print the resolved payload instead of creating").option("--json", "print the created issue as JSON").action(jiraAction(jiraCreate));
+	jira.command("create [project] [type]").description("Create a Jira issue, prompting for fields or taking them all as flags").option("-s, --summary <text>", "issue summary").option("-d, --description <markdown>", "description as Markdown").option("--description-file <path>", "read the description from a Markdown file").option("-a, --assignee <who>", "assignee: me, an account id, or a name to look up").option("--priority <name>", "priority name").option("-l, --label <label>", "label (repeatable)", collect).option("-c, --component <name>", "component (repeatable)", collect).option("--parent <key>", "parent issue key for subtasks").option("-f, --field <name=value>", "any other create-screen field (repeatable)", collect).option("--dry-run", "print the resolved payload instead of creating").option("--json", "print the created issue as JSON").action(jiraAction(jiraCreate));
 	jira.command("fields <project> [type]").description("Show the issue types you can create in a project, or the create form for one type").option("--json", "output results as JSON").action(jiraAction(jiraFields));
 	jira.command("view [issue]").description("Show a Jira issue (key or URL) in the terminal").option("--all-comments", "show all comments instead of the last 5").option("--no-pager", "print directly instead of paging long output").action(jiraAction(jiraView));
 	jira.command("copy [issue]").description("Copy a Jira issue (key or URL) to a Markdown file").option("-o, --out <path>", "output file or directory").action(jiraAction(jiraCopy));
 	jira.command("update [file]").description("Update a Jira issue description from an edited Markdown file").option("--summary", "also push the H1 as the issue summary").option("-f, --force", "skip the stale-issue and data-loss checks").option("--dry-run", "show what would change without writing").action(jiraAction(jiraUpdate));
-	jira.command("list").description("List open issues assigned to you").option("-p, --project <key>", "limit to a project").option("-a, --all", "include Done issues updated in the last 30 days").option("--json", "output results as JSON").option("-c, --copy", "pick results to copy to Markdown").option("-o, --out <dir>", "output directory for --copy").action(jiraAction(jiraList));
-	jira.command("search [query]").description("Search Jira issues (text query, filters, or --jql)").option("-p, --project <key>", "limit to a project").option("-a, --assignee <who>", "limit to an assignee (or 'me')").option("-s, --status <status>", "limit to a status").option("--jql <jql>", "raw JQL query (ignores other filters)").option("-l, --limit <n>", "max results (default 25, max 100)").option("--json", "output results as JSON").option("-c, --copy", "pick results to copy to Markdown").option("-o, --out <dir>", "output directory for --copy").action(jiraAction(jiraSearch));
+	outputOptions(jira.command("list").description("List open issues assigned to you").option("-p, --project <key>", "limit to a project").option("-a, --all", "include Done issues updated in the last 30 days")).action(jiraAction(jiraList));
+	outputOptions(jira.command("search [query]").description("Search Jira issues by text and filters").option("-p, --project <key>", "limit to a project (repeatable)", collect).option("-a, --assignee <who>", "limit to an assignee: me, a name, or an account id", collect).option("--reporter <who>", "limit to a reporter: me, a name, or an account id", collect).option("-s, --status <status>", "limit to a status (repeatable)", collect).option("-t, --type <type>", "limit to an issue type (repeatable)", collect).option("--label <label>", "limit to a label (repeatable)", collect).option("-u, --updated <when>", "changed since 7d, 2w, 3m, or YYYY-MM-DD").option("--open", "exclude issues in the Done category").addOption(moved("--jql <jql>", "jira jql"))).action(jiraAction(jiraSearch));
+	outputOptions(jira.command("jql <query>").description("Search Jira issues with a raw JQL query")).action(jiraAction(jiraJql));
 	return jira;
 }
 //#endregion
 //#region package.json
-var version = "1.14.0";
+var version = "2.1.0";
 //#endregion
 //#region src/cli/build.ts
 const PRODUCTS = {