@bensandee/forgejo-cli 0.4.3 → 0.4.4

package/dist/bin.mjs

@@ -163,7 +163,7 @@ function loadEnvFileForBin(rawArgs, bin, io = processIo) {
 //#region src/version.ts
 const parsed = z.object({ version: z.string() }).safeParse({
 	name: "@bensandee/forgejo-cli",
-	version: "0.4.3",
+	version: "0.4.4",
 	description: "bst-fj: Forgejo API commands without the rest of bst",
 	license: "MIT",
 	repository: {
@@ -2337,8 +2337,8 @@ async function createRelease(executor, conn, tag, options = {}) {
 	const url = `${conn.serverUrl}/api/v1/repos/${conn.repository}/releases`;
 	const payload = {
 		tag_name: tag,
-		name: tag,
-		body: `Published ${tag}`,
+		name: options.name ?? tag,
+		body: options.body ?? `Published ${tag}`,
 		prerelease: options.prerelease ?? false
 	};
 	if (options.target) payload["target_commitish"] = options.target;
@@ -2434,7 +2434,9 @@ async function ensureRelease(executor, conn, tag, options = {}) {
 		try {
 			await createRelease(executor, conn, tag, {
 				target: options.target,
-				prerelease: options.prerelease
+				prerelease: options.prerelease,
+				name: options.name,
+				body: options.body
 			});
 		} catch (error) {
 			const raced = await getReleaseByTag(executor, conn, tag);
@@ -2458,6 +2460,8 @@ async function ensureRelease(executor, conn, tag, options = {}) {
 	const recreated = options.target ? await recreateTagViaApi(executor, conn, tag, {
 		target: options.target,
 		prerelease: options.prerelease,
+		name: options.name,
+		body: options.body,
 		current,
 		attempts,
 		baseDelayMs
@@ -2469,7 +2473,7 @@ async function ensureRelease(executor, conn, tag, options = {}) {
 	throw new TransientError(`Release for ${tag} never got a real (non-epoch) created date after ${String(attempts)} attempts. This is an intermittent Forgejo bug: a pushed tag's date settles asynchronously and a racing release creation freezes it at the Unix epoch (1969/1970). ` + (options.target ? `Recreating the tag via the API did not help -- investigate the server or upgrade Forgejo.` : `Pass the release tag's target commit so the tag can be recreated, or retry the release.`));
 }
 async function recreateTagViaApi(executor, conn, tag, opts) {
-	const { target, prerelease, current, attempts, baseDelayMs } = opts;
+	const { target, prerelease, name, body, current, attempts, baseDelayMs } = opts;
 	log.warn(`Release for ${tag} stayed epoch-dated -- recreating the tag via the API so Forgejo stamps a real date (the tag becomes lightweight)`);
 	if (current) await deleteRelease(executor, conn, current.id);
 	await deleteTag(executor, conn, tag);
@@ -2477,7 +2481,9 @@ async function recreateTagViaApi(executor, conn, tag, opts) {
 		try {
 			await createRelease(executor, conn, tag, {
 				target,
-				prerelease
+				prerelease,
+				name,
+				body
 			});
 		} catch (error) {
 			if (attempt >= attempts) throw new TransientError(`Release for ${tag} was deleted to repair its epoch date, but recreating it from ${target} failed: ${describeError(error)}. The tag no longer exists on the server -- re-push it (or re-run the release) to restore it.`);
@@ -2501,6 +2507,24 @@ async function settleBackoff(attempt, baseDelayMs) {
 	const delay = Math.min(baseDelayMs * 2 ** (attempt - 1), SETTLE_MAX_DELAY_MS);
 	await new Promise((resolve) => setTimeout(resolve, delay));
 }
+z.looseObject({
+	id: z.number(),
+	tag_name: z.string(),
+	name: z.string().nullish(),
+	target_commitish: z.string().nullish(),
+	created_at: z.string().nullish(),
+	html_url: z.string().nullish(),
+	draft: z.boolean().optional(),
+	prerelease: z.boolean().optional(),
+	assets: z.array(z.unknown()).nullish()
+});
+z.looseObject({
+	name: z.string(),
+	commit: z.looseObject({
+		sha: z.string(),
+		created: z.string().nullish()
+	})
+});
 //#endregion
 //#region src/commands/release-create.ts
 const releaseCreateCommand = defineCommand({
@@ -6565,36 +6589,52 @@ z.object({
 	})
 });
 //#endregion
-//#region src/pr-merge.ts
-const METHODS = [
+//#region ../forgejo/src/pr-merge-run.ts
+const MERGE_METHODS = [
 	"merge",
 	"rebase",
 	"squash"
 ];
 const RECHECK_DELAY_MS = 2e3;
-function parseMethod(raw) {
-	if (raw === void 0) return "merge";
-	const method = METHODS.find((candidate) => candidate === raw);
-	if (method === void 0) throw new FatalError(`Invalid --method "${raw}" (expected one of: ${METHODS.join(", ")}).`);
-	return method;
+const MIN_SHA_PREFIX = 7;
+function sleepDefault(ms) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
 }
-async function runPrMerge(fetcher, options) {
-	const number = parsePrNumber(options.number);
-	const method = parseMethod(options.method);
-	const conn = requireForgejoTarget(options.cwd, parseRepoTarget(options.repo), "pr:merge is Forgejo-only -- use gh pr merge on GitHub.");
+function headMatches(expected, actual) {
+	const want = expected.trim().toLowerCase();
+	return want.length >= MIN_SHA_PREFIX && actual.toLowerCase().startsWith(want);
+}
+async function runPrMergeCore(fetcher, conn, number, options = {}) {
 	const pr = `PR #${String(number)}`;
+	const method = options.method ?? "merge";
+	const expected = options.expectedHeadSha;
+	const moved = (headSha) => expected !== void 0 && !headMatches(expected, headSha);
 	const confirmation = await confirmMergeable(fetcher, conn, number, {
 		delayMs: RECHECK_DELAY_MS,
-		sleep: options.sleep ?? sleep,
-		settleOnFirstRead: (gate) => !gate.open || gate.draft
+		sleep: options.sleep ?? sleepDefault,
+		settleOnFirstRead: (gate) => !gate.open || gate.draft || moved(gate.headSha)
 	});
 	const { gate, verdict } = confirmation;
-	if (!gate.open) throw new FatalError(`Refusing to merge ${pr}: it is closed.`);
-	if (gate.draft) throw new FatalError(`Refusing to merge ${pr}: it is a draft.`);
-	if (verdict === "conflicted") throw new FatalError(`Refusing to merge ${pr}: it has conflicts. ${confirmation.evidence ?? ""}`.trimEnd());
-	if (verdict === "unconfirmed") throw new FatalError(`Refusing to merge ${pr}: the forge could not confirm it is mergeable. ${confirmation.evidence ?? ""}`.trimEnd());
-	const checks = classifyBaseStatus(await readCommitChecks(fetcher, conn, gate.headSha));
-	if (checks !== "green" && !options.ignoreChecks) throw new FatalError(`Refusing to merge ${pr}: its checks at ${gate.headSha} are ${checks}, not green. Pass --ignore-checks to merge anyway.`);
+	const refuse = (why) => ({
+		kind: "refused",
+		reason: `Refusing to merge ${pr}: ${why}`
+	});
+	if (!gate.open) return refuse("it is closed.");
+	if (gate.draft) return refuse("it is a draft.");
+	if (options.refuseEmpty === true && (gate.headSha === gate.mergeBase || gate.changedFiles === 0)) return refuse("its diff against its base is empty, so its branch is left alone.");
+	if (expected !== void 0 && moved(gate.headSha)) return refuse(`its head is ${gate.headSha}, not the approved ${expected}.`);
+	if (verdict === "conflicted") return refuse(`it has conflicts. ${confirmation.evidence ?? ""}`.trimEnd());
+	if (verdict === "unconfirmed") return refuse(`the forge could not confirm it is mergeable. ${confirmation.evidence ?? ""}`.trimEnd());
+	const read = await readCommitChecks(fetcher, conn, gate.headSha);
+	const checks = classifyBaseStatus(read);
+	const skippedOnly = read.parsed && read.contexts.length > 0 && read.contexts.every((context) => context.verdict === "skipped");
+	if (!(checks === "green" || options.ignoreChecks === true || (checks === "no-status" || skippedOnly) && options.allowNoStatus === true)) return {
+		kind: "refused",
+		reason: `Refusing to merge ${pr}: its checks at ${gate.headSha} are ${checks}, not green.`,
+		checks
+	};
 	const result = {
 		number,
 		merged: false,
@@ -6603,17 +6643,47 @@ async function runPrMerge(fetcher, options) {
 		verdict,
 		checks
 	};
-	if (options.dryRun) return result;
+	if (options.dryRun === true) return {
+		kind: "ok",
+		result
+	};
 	await mergePr(fetcher, conn, number, {
 		method,
-		deleteBranch: options.deleteBranch,
+		deleteBranch: options.deleteBranch ?? false,
 		expectedHeadSha: gate.headSha
 	});
 	return {
-		...result,
-		merged: true
+		kind: "ok",
+		result: {
+			...result,
+			merged: true
+		}
 	};
 }
+//#endregion
+//#region src/pr-merge.ts
+function parseMethod(raw) {
+	if (raw === void 0) return "merge";
+	const method = MERGE_METHODS.find((candidate) => candidate === raw);
+	if (method === void 0) throw new FatalError(`Invalid --method "${raw}" (expected one of: ${MERGE_METHODS.join(", ")}).`);
+	return method;
+}
+async function runPrMerge(fetcher, options) {
+	const number = parsePrNumber(options.number);
+	const method = parseMethod(options.method);
+	const outcome = await runPrMergeCore(fetcher, requireForgejoTarget(options.cwd, parseRepoTarget(options.repo), "pr:merge is Forgejo-only -- use gh pr merge on GitHub."), number, {
+		method,
+		deleteBranch: options.deleteBranch,
+		ignoreChecks: options.ignoreChecks,
+		dryRun: options.dryRun,
+		sleep: options.sleep ?? sleep
+	});
+	if (outcome.kind === "refused") {
+		const hint = outcome.checks === void 0 ? "" : " Pass --ignore-checks to merge anyway.";
+		throw new FatalError(`${outcome.reason}${hint}`);
+	}
+	return outcome.result;
+}
 function renderPrMerge(result) {
 	const what = `PR #${String(result.number)} (${result.method}) at ${result.headSha.slice(0, 12)}, checks ${result.checks}`;
 	return result.merged ? `Merged ${what}.` : `Dry run: would merge ${what}.`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/forgejo-cli",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "bst-fj: Forgejo API commands without the rest of bst",
   "license": "MIT",
   "repository": {