@bensandee/forgejo-cli 0.5.4 → 0.5.6

package/dist/bin.mjs

@@ -162,7 +162,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.5.4",
+	version: "0.5.6",
 	description: "bst-fj: Forgejo API commands without the rest of bst",
 	license: "MIT",
 	repository: {
@@ -1664,6 +1664,16 @@ const commitStatusCommand = defineCommand({
 	}
 });
 //#endregion
+//#region ../forgejo/src/fetcher.ts
+const LONG_FETCH_TIMEOUT_MS = 6e5;
+function morePagesFollow(res, pageLength, received, pageSize) {
+	if (pageLength === 0) return false;
+	const raw = res.headers.get("x-total-count")?.trim() ?? "";
+	const total = raw === "" ? NaN : Number(raw);
+	if (!Number.isSafeInteger(total) || total < 0) return pageLength >= pageSize;
+	return received < total;
+}
+//#endregion
 //#region ../forgejo/src/label-provisioning.ts
 const LabelSchema = z.object({
 	id: z.number(),
@@ -1673,7 +1683,7 @@ const LabelSchema = z.object({
 	exclusive: z.boolean().optional()
 });
 const LabelListSchema = z.array(LabelSchema);
-const LABELS_PAGE_SIZE = 100;
+const LABELS_PAGE_SIZE = 50;
 const LABELS_MAX_PAGES = 20;
 async function fetchAllForgejoLabels(executor, conn) {
 	const labels = [];
@@ -1686,7 +1696,7 @@ async function fetchAllForgejoLabels(executor, conn) {
 		const parsed = LabelListSchema.safeParse(await res.json());
 		if (!parsed.success) throw new UnexpectedError(`Unexpected label-list response: ${parsed.error.message}`);
 		labels.push(...parsed.data);
-		if (parsed.data.length < LABELS_PAGE_SIZE) break;
+		if (!morePagesFollow(res, parsed.data.length, labels.length, LABELS_PAGE_SIZE)) break;
 	}
 	return labels;
 }
@@ -1900,7 +1910,10 @@ async function fetchIssueListPage(executor, conn, params) {
 		verb: "list issues",
 		resource: conn.repository
 	}, repoNotFoundMessage(conn));
-	return parseIssueListOrThrow(await res.json());
+	return {
+		raw: parseIssueListOrThrow(await res.json()),
+		res
+	};
 }
 function normalizeDetailedIssues(raw, type) {
 	const normalized = raw.map(normalizeIssue);
@@ -1911,7 +1924,7 @@ const DETAILED_LIST_MAX_PAGES = 20;
 async function listForgejoIssuesDetailedPaged(executor, conn, query, options) {
 	const issues = [];
 	for (let page = 1; page <= DETAILED_LIST_MAX_PAGES; page++) {
-		const raw = await fetchIssueListPage(executor, conn, issueListParams(query.type, {
+		const { raw } = await fetchIssueListPage(executor, conn, issueListParams(query.type, {
 			...query,
 			limit: DETAILED_LIST_PAGE_SIZE,
 			page
@@ -2301,9 +2314,6 @@ const labelsCommand = defineCommand({
 	}
 });
 //#endregion
-//#region ../forgejo/src/fetcher.ts
-const LONG_FETCH_TIMEOUT_MS = 6e5;
-//#endregion
 //#region ../forgejo/src/releases.ts
 const SETTLE_ATTEMPTS = 4;
 const SETTLE_BASE_DELAY_MS = 2e3;
@@ -2794,7 +2804,7 @@ const deleteCommand = defineCommand({
 const secretsCommand = defineCommand({
 	meta: {
 		name: "secrets",
-		description: "Low-level CRUD for individual Forgejo Actions secrets (set, list, delete). Use bst setup:secrets (in @bensandee/tooling) for initial repo onboarding"
+		description: "Low-level CRUD for individual Forgejo Actions secrets (set, list, delete). Use pnpm exec bst setup:secrets (in @bensandee/tooling) for initial repo onboarding"
 	},
 	args: { json: {
 		type: "boolean",
@@ -2891,7 +2901,7 @@ async function paginate(executor, conn, endpoint, verb, extract) {
 		}));
 		const items = extract(await res.json());
 		all.push(...items);
-		if (items.length < PAGE_LIMIT) break;
+		if (!morePagesFollow(res, items.length, all.length, PAGE_LIMIT)) break;
 		if (page === 101) throw new UnexpectedError(`${endpoint} still returns full pages after ${String(MAX_PAGES)} pages; refusing to report a prefix of it`);
 	}
 	return all;
@@ -3876,7 +3886,7 @@ async function listForgejoComments(executor, conn, number, options = {}) {
 		}, issueNotFoundMessage(conn, number));
 		const parsed = parseCommentListOrThrow(await res.json());
 		comments.push(...parsed.map(normalizeComment));
-		if (parsed.length < COMMENTS_PAGE_SIZE) break;
+		if (!morePagesFollow(res, parsed.length, comments.length, COMMENTS_PAGE_SIZE)) break;
 		if (page === COMMENTS_MAX_PAGES) {
 			log.warn(`Comment listing for #${String(number)} hit the ${String(COMMENTS_MAX_PAGES)}-page cap; results may be truncated`);
 			options.onPageCap?.();
@@ -4505,7 +4515,7 @@ function formatIssueList(result) {
 //#endregion
 //#region src/issue-transport.ts
 function githubRefusal(command) {
-	return `bst-fj is Forgejo-only -- use \`gh\` or \`bst ${command}\` for a github.com repository.`;
+	return `bst-fj is Forgejo-only -- use \`gh\` or \`pnpm exec bst ${command}\` for a github.com repository.`;
 }
 function forgejoIssueTarget(cwd, target, command) {
 	const conn = requireForgejoTarget(cwd, target, githubRefusal(command));
@@ -4580,7 +4590,7 @@ const issueCommentCommand = defineCommand({
 			out.json(result);
 			out.text(formatIssueComment(result, dryRun));
 		} catch (error) {
-			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("bst-fj issue:comment 273"));
+			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("pnpm exec bst-fj issue:comment 273"));
 			throw error;
 		}
 	}
@@ -4807,7 +4817,7 @@ const issueDownloadCommand = defineCommand({
 			out.json(result);
 			out.text(formatDownload(result, dryRun));
 		} catch (error) {
-			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("bst-fj issue:download 273"));
+			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("pnpm exec bst-fj issue:download 273"));
 			if (error instanceof AttachmentExistsError) throw new FatalError(describeAttachmentExists(error, "--force"));
 			throw error;
 		}
@@ -4987,7 +4997,7 @@ function defineIssueLabelCommand(action) {
 				out.json(result);
 				out.text(formatIssueLabel(result, dryRun));
 			} catch (error) {
-				if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired(`bst-fj ${name} 273 agent/implement`));
+				if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired(`pnpm exec bst-fj ${name} 273 agent/implement`));
 				throw error;
 			}
 		}
@@ -5050,7 +5060,7 @@ const issueSetLabelsCommand = defineCommand({
 			out.json(result);
 			out.text(formatIssueSetLabels(result, dryRun));
 		} catch (error) {
-			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("bst-fj issue:set-labels 273 agent/plan"));
+			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("pnpm exec bst-fj issue:set-labels 273 agent/plan"));
 			if (error instanceof NoLabelsGivenError) throw new FatalError(describeNoLabelsGiven(error, "--clear"));
 			throw error;
 		}
@@ -5214,10 +5224,10 @@ function defineIssueStateCommand(action) {
 				out.text(formatIssueState(result, dryRun));
 				if (dryRun && comment !== void 0 && result.comment?.posted === true) out.text(`[dry-run] Comment that would be posted:\n${comment}`);
 			} catch (error) {
-				if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired(`bst-fj ${name} 273`));
+				if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired(`pnpm exec bst-fj ${name} 273`));
 				if (error instanceof EmptyCommentError) throw new FatalError(describeEmptyComment(flags));
 				if (error instanceof PullRequestStateError) {
-					const advice = action === "close" ? `Run \`bst-fj pr:close ${String(error.number)}\` to close it.` : "Use the forge UI to change a pull request's state.";
+					const advice = action === "close" ? `Run \`pnpm exec bst-fj pr:close ${String(error.number)}\` to close it.` : "Use the forge UI to change a pull request's state.";
 					throw new FatalError(describePullRequestState(error, {
 						command: `bst-fj ${name}`,
 						advice
@@ -5351,7 +5361,7 @@ const issueUpdateCommand = defineCommand({
 				out.text(`[dry-run] Current body:\n${current}`);
 			}
 		} catch (error) {
-			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("bst-fj issue:update 273 --title '...'"));
+			if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("pnpm exec bst-fj issue:update 273 --title '...'"));
 			if (error instanceof NothingToUpdateError) throw new FatalError(describeNothingToUpdate({
 				title: "--title",
 				body: "--body",
@@ -5399,7 +5409,7 @@ const issueSubCommands = {
 				out.json(view);
 				out.text(formatIssue(view));
 			} catch (error) {
-				if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("bst-fj issue:view 273"));
+				if (error instanceof IssueNumberRequiredError) throw new FatalError(describeIssueNumberRequired("pnpm exec bst-fj issue:view 273"));
 				throw error;
 			}
 		}
@@ -5776,7 +5786,7 @@ const prCloseCommand = defineCommand({
 			if (dryRun && comment !== void 0 && result.comment?.posted === true) out.text(`[dry-run] Comment that would be posted:\n${comment}`);
 		} catch (error) {
 			if (error instanceof EmptyCommentError) throw new FatalError(describeEmptyComment(flags));
-			if (error instanceof NotAPullRequestError) throw new FatalError(`#${String(error.number)} is an issue, not a pull request -- pr:close refuses to write issue state. Use \`bst-fj issue:close ${String(error.number)}\` to close it.`);
+			if (error instanceof NotAPullRequestError) throw new FatalError(`#${String(error.number)} is an issue, not a pull request -- pr:close refuses to write issue state. Use \`pnpm exec bst-fj issue:close ${String(error.number)}\` to close it.`);
 			throw error;
 		}
 	}
@@ -6327,8 +6337,8 @@ function cliGit() {
 //#endregion
 //#region src/pr-run.ts
 const COMMANDS = {
-	create: "bst-fj pr:create",
-	update: "bst-fj pr:update"
+	create: "pnpm exec bst-fj pr:create",
+	update: "pnpm exec bst-fj pr:update"
 };
 const FLAGS = {
 	body: "--body",
@@ -6411,7 +6421,7 @@ const prCreateCommand = defineCommand({
 	async run({ args }) {
 		const out = createCliOutput(args.json === true);
 		const body = readBodySource(args.body ?? void 0, args["body-file"] ?? void 0);
-		const result = await runForgejoPr("bst-fj pr:create works on Forgejo only. Use `gh pr create` on GitHub, or `bst pr:create`, which covers both.", {
+		const result = await runForgejoPr("bst-fj pr:create works on Forgejo only. Use `gh pr create` on GitHub, or `pnpm exec bst pr:create`, which covers both.", {
 			mode: args.upsert === true ? "upsert" : "create",
 			title: args.title ?? void 0,
 			body,
@@ -6434,6 +6444,7 @@ const prCreateCommand = defineCommand({
 const DEFAULT_LIMIT = 100;
 const PrFileEntrySchema = z.object({
 	filename: z.string(),
+	previous_filename: z.string().nullish(),
 	status: z.string().nullish(),
 	additions: z.number().default(0),
 	deletions: z.number().default(0)
@@ -6466,6 +6477,7 @@ async function readPrFilesPage(executor, conn, prNumber, page, limit) {
 	return {
 		files: parsed.data.map((file) => ({
 			filename: file.filename,
+			previousFilename: file.previous_filename ?? null,
 			status: file.status ?? null,
 			additions: file.additions,
 			deletions: file.deletions
@@ -7144,7 +7156,7 @@ const prSubCommands = {
 			const out = createCliOutput(args.json === true);
 			const body = readBodySource(args.body ?? void 0, args["body-file"] ?? void 0);
 			const rewrites = args.title !== void 0 || body !== void 0;
-			const result = await runForgejoPr("bst-fj pr:update works on Forgejo only. Use `gh pr edit` on GitHub, or `bst pr:update`, which covers both.", {
+			const result = await runForgejoPr("bst-fj pr:update works on Forgejo only. Use `gh pr edit` on GitHub, or `pnpm exec bst pr:update`, which covers both.", {
 				mode: "update",
 				title: args.title ?? void 0,
 				body,

package/package.json

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