@bensandee/forgejo-cli 0.5.3 → 0.5.5

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.3",
+	version: "0.5.5",
 	description: "bst-fj: Forgejo API commands without the rest of bst",
 	license: "MIT",
 	repository: {
@@ -192,13 +192,13 @@ const parsed = z.object({ version: z.string() }).safeParse({
 	dependencies: {
 		"@bensandee/common": "0.2.0",
 		"citty": "^0.2.2",
-		"zod": "^4.6.5"
+		"zod": "^4.6.7"
 	},
 	devDependencies: {
 		"@bensandee/cli-kit": "workspace:*",
 		"@bensandee/forgejo": "workspace:*",
-		"@types/node": "24.19.1",
-		"tsdown": "0.23.0"
+		"@types/node": "24.19.2",
+		"tsdown": "0.23.1"
 	}
 });
 if (!parsed.success) throw new UnexpectedError(`@bensandee/forgejo-cli's package.json has no string version.`);
@@ -896,7 +896,8 @@ function resolveRepoUrlFrom(readOrigin, readPackageUrl) {
 	const originUrl = normalizeGitUrl(readOrigin() ?? "");
 	if (originUrl !== null && parseGitUrl(originUrl) !== null) return originUrl;
 	const pkgUrl = readPackageUrl();
-	return pkgUrl !== null && parseGitUrl(pkgUrl) !== null ? pkgUrl : null;
+	if (pkgUrl === null || parseGitUrl(pkgUrl) === null) return null;
+	return normalizeGitUrl(pkgUrl);
 }
 function resolveForgejoConnection(env, repoUrl) {
 	const serverUrl = env["FORGEJO_SERVER_URL"];
@@ -987,10 +988,11 @@ function resolveIssueTarget(refTarget, repo) {
 	throw new RepoTargetMismatchError(`${repoTarget.serverUrl}/${repoTarget.repository}`, `${refTarget.serverUrl}/${refTarget.repository}`);
 }
 function normalizeGitUrl(raw) {
-	const sshMatch = raw.match(/^git@([^:]+):(.+?)(?:\.git)?$/);
+	const value = raw.startsWith("git+") ? raw.slice(4) : raw;
+	const sshMatch = value.match(/^git@([^:]+):(.+?)(?:\.git)?$/);
 	if (sshMatch) return `https://${sshMatch[1]}/${sshMatch[2]}`;
 	try {
-		const url = new URL(raw);
+		const url = new URL(value);
 		url.pathname = url.pathname.replace(/\.git$/, "");
 		url.username = "";
 		url.password = "";
@@ -2576,10 +2578,9 @@ const releaseCreateCommand = defineCommand({
 });
 //#endregion
 //#region ../forgejo/src/secrets.ts
-const ActionSecretListSchema = z.object({
-	secrets: z.array(z.object({ name: z.string() })),
-	total_count: z.number()
-});
+const ActionSecretListSchema = z.array(z.object({ name: z.string() }));
+const SECRETS_PAGE_SIZE = 50;
+const SECRETS_MAX_PAGES = 20;
 z.object({ sha1: z.string() });
 const NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const FORBIDDEN_PREFIX_PATTERN = /^(FORGEJO_|GITEA_|GITHUB_|[0-9])/i;
@@ -2605,10 +2606,8 @@ async function setActionSecret(executor, conn, secretName, secretValue) {
 async function listActionSecrets(executor, conn) {
 	const [owner, repo] = conn.repository.split("/");
 	const names = [];
-	let page = 1;
-	const limit = 50;
-	for (;;) {
-		const url = `${conn.serverUrl}/api/v1/repos/${owner}/${repo}/actions/secrets?page=${String(page)}&limit=${String(limit)}`;
+	for (let page = 1; page <= 21; page++) {
+		const url = `${conn.serverUrl}/api/v1/repos/${owner}/${repo}/actions/secrets?page=${String(page)}&limit=${String(SECRETS_PAGE_SIZE)}`;
 		const res = await executor.fetch(url, { headers: { Authorization: `token ${conn.token}` } });
 		if (!res.ok) throw new TransientError(await forgejoErrorMessage(res, {
 			verb: "list secrets",
@@ -2616,9 +2615,9 @@ async function listActionSecrets(executor, conn) {
 		}));
 		const parsed = ActionSecretListSchema.safeParse(await res.json());
 		if (!parsed.success) throw new UnexpectedError(`Unexpected secrets list response: ${parsed.error.message}`);
-		for (const secret of parsed.data.secrets) names.push(secret.name);
-		if (names.length >= parsed.data.total_count) break;
-		page++;
+		for (const secret of parsed.data) names.push(secret.name);
+		if (parsed.data.length === 0) break;
+		if (page === 21) throw new UnexpectedError(`${owner}/${repo} still lists secrets after ${String(SECRETS_MAX_PAGES)} pages; refusing to report a prefix of them`);
 	}
 	return names;
 }
@@ -2795,7 +2794,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",
@@ -2879,11 +2878,11 @@ async function hasAdminAccess(executor, conn) {
 const OrgSchema = z.object({ username: z.string() });
 const OrgListSchema = z.array(OrgSchema);
 const PAGE_LIMIT = 50;
+const MAX_PAGES = 100;
 async function paginate(executor, conn, endpoint, verb, extract) {
 	const all = [];
-	let page = 1;
 	const separator = endpoint.includes("?") ? "&" : "?";
-	for (;;) {
+	for (let page = 1; page <= 101; page++) {
 		const url = `${conn.serverUrl}/api/v1${endpoint}${separator}page=${String(page)}&limit=${String(PAGE_LIMIT)}`;
 		const res = await executor.fetch(url, { headers: { Authorization: `token ${conn.token}` } });
 		if (!res.ok) throw new TransientError(await forgejoErrorMessage(res, {
@@ -2893,7 +2892,7 @@ async function paginate(executor, conn, endpoint, verb, extract) {
 		const items = extract(await res.json());
 		all.push(...items);
 		if (items.length < PAGE_LIMIT) break;
-		page++;
+		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;
 }
@@ -3516,6 +3515,7 @@ function collectInputArgs(rawArgs) {
 	for (let i = 0; i < rawArgs.length; i += 1) {
 		const arg = rawArgs[i];
 		if (arg === void 0) continue;
+		if (arg === "--") break;
 		if (arg === INPUT_FLAG) {
 			const next = rawArgs[i + 1];
 			if (next === void 0) throw new FatalError("Missing value for --input: expected `--input key=value`");
@@ -4505,7 +4505,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 +4580,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 +4807,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 +4987,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 +5050,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 +5214,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 +5351,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 +5399,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 +5776,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 +6327,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 +6411,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 +6434,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 +6467,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 +7146,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.3",
+  "version": "0.5.5",
   "description": "bst-fj: Forgejo API commands without the rest of bst",
   "license": "MIT",
   "repository": {
@@ -29,13 +29,13 @@
   "dependencies": {
     "@bensandee/common": "0.2.0",
     "citty": "^0.2.2",
-    "zod": "^4.6.5"
+    "zod": "^4.6.7"
   },
   "devDependencies": {
     "@bensandee/cli-kit": "0.0.0",
     "@bensandee/forgejo": "0.7.0",
-    "@types/node": "24.19.1",
-    "tsdown": "0.23.0"
+    "@types/node": "24.19.2",
+    "tsdown": "0.23.1"
   },
   "scripts": {
     "build": "tsdown",