rolldown-pnpm-config 2.1.7 → 2.2.0

package/README.md

@@ -78,7 +78,7 @@ The bundled `rolldown-pnpm-config upgrade` command rewrites the version ranges i
 ```bash
 npx rolldown-pnpm-config upgrade
 # opens a radio-group table, one row per package, then on <Enter>:
-# Applied <n> change(s).
+# Applied <n> changes.
 ```
 
 The command shows an interactive table by default — every catalog package at once, one row per package, `●`/`○` bubbles, modeled on `pnpm up -i`. `--yes` takes the latest in-range version for every package without prompting and fails hard on any warning or unresolvable package name; `--dry-run` runs the identical table and skips only the write; `--catalog <name>` restricts the table to one catalog. Pass `--preview` for a non-interactive projection of what an upgrade would do, with `--full` to show up-to-date entries too. The output is colorized in a supporting terminal. For packages that declare a `strategy`, the command also resyncs their materialized peer range, preserving any prerelease identifier rather than rebuilding it from parsed version parts. See [upgrading catalogs](https://github.com/spencerbeggs/rolldown-pnpm-config/blob/main/docs/05-upgrading-catalogs.md) for the full surface.

package/cli/commands/export.js

@@ -15,9 +15,9 @@ import { failureDoc } from "../render/report.js";
 import { findConfigFiles, pickConfigCandidate } from "../select-file.js";
 import { overlayWorkspace } from "../workspace-overlay.js";
 import { Data, Effect, Option, Predicate } from "effect";
-import { existsSync, writeFileSync } from "node:fs";
 import { dirname, relative } from "node:path";
 import { CliDoc, CliMessage } from "@effected/cli";
+import { existsSync, writeFileSync } from "node:fs";
 import { Argument, Command, Flag } from "effect/cli";
 
 // src/cli/commands/export.ts

package/cli/commands/upgrade.js

@@ -18,10 +18,10 @@ import { summaryDoc } from "../summary.js";
 import { validateEdits } from "../validate.js";
 import { buildWalkItems } from "../walk-plan.js";
 import { findWorkspaceRoot, makeWorkspaceResolver } from "../workspace-resolve.js";
-import { Clock, Console, Data, Effect, Option, Result, Runtime } from "effect";
-import { readFileSync, writeFileSync } from "node:fs";
+import { Clock, Data, Effect, Option, Result } from "effect";
 import { dirname } from "node:path";
-import { CliDoc, CliExit, CliInteractive, CliMessage, Doc } from "@effected/cli";
+import { CliDoc, CliExit, CliFormat, CliInteractive, CliMessage, Doc, Fmt } from "@effected/cli";
+import { readFileSync, writeFileSync } from "node:fs";
 import { Argument, Command, Flag } from "effect/cli";
 import { CliUi } from "@effected/cli/ui";
 import { ReleaseAgeGate } from "@effected/npm";
@@ -40,12 +40,12 @@ var UpgradeError = class extends Data.TaggedError("UpgradeError") {
 };
 /**
 * An invalid flag combination: a usage error, so it exits 64 (BSD
-* `EX_USAGE`) rather than the 1 a resolution failure exits with.
+* `EX_USAGE`) rather than the 1 a resolution failure exits with. The code is
+* mapped by tag in `EXIT_CODES`, which `main` hands to `CliRuntime.main`.
 *
 * @internal
 */
 var UpgradeUsageError = class extends Data.TaggedError("UpgradeUsageError") {
-	[Runtime.errorExitCode] = 64;
 	/** The failure report `CliRuntime.main` prints: the message, without the class name. */
 	[CliDoc]() {
 		return failureDoc(this.message);
@@ -80,7 +80,7 @@ function readCatalogSource(file) {
 		});
 		const { entries, skipped } = yield* Effect.try({
 			try: () => discoverCatalogEntries(source, file),
-			catch: (e) => new UpgradeError({ message: String(e) })
+			catch: (e) => new UpgradeError({ message: Fmt.describe(e) })
 		});
 		return {
 			source,
@@ -279,7 +279,7 @@ function runUpgrade(opts) {
 			kind: "peer-strategy"
 		}));
 		const { accepted, rejected } = yield* validateEdits(edits, versionsByPkg.raw);
-		if (rejected.length > 0) return yield* Effect.fail(new UpgradeError({ message: `Refusing to write unsatisfiable range(s):\n${rejected.map((r) => `  ${r.reason}`).join("\n")}` }));
+		if (rejected.length > 0) return yield* Effect.fail(new UpgradeError({ message: `Refusing to write ${Fmt.plural(rejected.length, "unsatisfiable range")}:\n${rejected.map((r) => `  ${r.reason}`).join("\n")}` }));
 		const allEdits = [...accepted, ...interopEdits];
 		if (allEdits.length > 0 && !opts.dryRun) {
 			const next = applyEdits(source, allEdits);
@@ -331,7 +331,7 @@ function applyInteropAndDecisions(file, source, nonInteropEdits, interopEdits) {
 * @internal
 */
 function nothingToUpgradeMessage(totalItems) {
-	return totalItems === 0 ? "Nothing to upgrade — no catalog packages found." : `Nothing to upgrade — ${totalItems} package(s) already up to date.`;
+	return totalItems === 0 ? "Nothing to upgrade — no catalog packages found." : `Nothing to upgrade — ${Fmt.plural(totalItems, "package")} already up to date.`;
 }
 /**
 * The message for packages the registry could not resolve. Almost always a
@@ -342,7 +342,7 @@ function nothingToUpgradeMessage(totalItems) {
 */
 function unresolvedMessage(unresolved) {
 	const list = unresolved.map((p) => `  ${p}`).join("\n");
-	return `Could not resolve ${unresolved.length} package(s) from the registry — check the name(s) for typos, or your registry auth:\n${list}`;
+	return `Could not resolve ${Fmt.plural(unresolved.length, "package")} from the registry — check each name for a typo, or your registry auth:\n${list}`;
 }
 /** Project walk items to the non-interactive default decisions (latest-in-range, plus peer-only keeps). @internal */
 function projectDecisions(items, full) {
@@ -413,7 +413,7 @@ function checkOutcome(changed) {
 	return {
 		exitCode: 1,
 		doc: [
-			Doc.line(`Catalog drift detected in ${changed.length} package(s):`),
+			Doc.line(`Catalog drift detected in ${Fmt.plural(changed.length, "package")}:`),
 			Doc.lines(changed.map((c) => `  ${c.name}  (${c.source})`), { wrap: false }),
 			Doc.line([
 				"Run ",
@@ -434,12 +434,12 @@ function driftRowJson(row) {
 	};
 }
 /**
-* The `--check --json` outcome. stdout carries exactly one single-line JSON
-* document (`json`, written with `Console.log`) in EVERY case — including the
-* resolution-failure family, which keeps its non-zero exit but must never
-* leave a bash gate with exit 1 and an empty stdout. A resolution failure is
-* also returned as `failure`, which the command fails with so the labelled
-* human report lands on stderr.
+* The `--check --format json` outcome. stdout carries exactly one JSON
+* document (`data`, printed by `CliFormat.print` on one line) in EVERY case —
+* including the resolution-failure family, which keeps its non-zero exit but
+* must never leave a bash gate with exit 1 and an empty stdout. A resolution
+* failure is also returned as `failure`, which the command fails with so the
+* labelled human report lands on stderr.
 *
 * @internal
 */
@@ -448,14 +448,14 @@ function checkJsonOutcome(result) {
 		const { message, kind } = result.failure;
 		return {
 			exitCode: 1,
-			json: JSON.stringify({
+			data: {
 				command: "check",
 				inSync: false,
 				error: {
 					kind: kind ?? "resolution",
 					message
 				}
-			}),
+			},
 			failure: new CheckFailedError({
 				message,
 				...kind !== void 0 ? { kind } : {}
@@ -465,15 +465,15 @@ function checkJsonOutcome(result) {
 	const changed = result.success.changed;
 	return {
 		exitCode: changed.length === 0 ? 0 : 1,
-		json: JSON.stringify({
+		data: {
 			command: "check",
 			inSync: changed.length === 0,
 			drift: changed.map(driftRowJson)
-		})
+		}
 	};
 }
 /**
-* The `--yes --json` / `--dry-run --json` outcome. `applied` reports whether
+* The `--yes --format json` / `--dry-run --format json` outcome. `applied` reports whether
 * the run wrote at least one change — always false under dry-run AND on an
 * already-in-sync run, so a consumer keying on it never reads a no-op as a
 * real apply; `changed` uses the same row object as check's `drift`. A failure
@@ -487,19 +487,19 @@ function upgradeJsonOutcome(result, dryRun) {
 	if (Result.isFailure(result)) {
 		const { message, kind } = result.failure;
 		return {
-			json: JSON.stringify({
+			data: {
 				command: "upgrade",
 				applied: false,
 				error: {
 					kind: kind ?? "resolution",
 					message
 				}
-			}),
+			},
 			failure: result.failure
 		};
 	}
 	const r = result.success;
-	return { json: JSON.stringify({
+	return { data: {
 		command: "upgrade",
 		applied: !dryRun && r.updated > 0,
 		updated: r.updated,
@@ -510,21 +510,21 @@ function upgradeJsonOutcome(result, dryRun) {
 			ceiling: c.ceiling,
 			blockedBy: c.blockedBy
 		}))
-	}) };
+	} };
 }
 /**
-* Reject `--json` outside the non-interactive modes it exists for. JSON mode
-* is a machine contract (a GitHub Action parsing stdout from bash); the
+* Reject `--format json` outside the non-interactive modes it exists for. JSON
+* mode is a machine contract (a GitHub Action parsing stdout from bash); the
 * interactive table and the preview views have no meaningful document to emit.
-* Returns the usage error to fail with (exit 64), or null when the combination
-* is valid.
+* Returns the usage error to fail with (exit 64, see `EXIT_CODES`), or null
+* when the combination is valid.
 *
 * @internal
 */
-function validateJsonMode(flags) {
-	if (!flags.json) return null;
-	if (flags.preview) return new UpgradeUsageError({ message: "--json cannot be combined with --preview; use --check, --yes, or --dry-run" });
-	if (!flags.check && !flags.yes && !flags.dryRun) return new UpgradeUsageError({ message: "--json requires a non-interactive mode: combine it with --check, --yes, or --dry-run" });
+function validateFormatMode(flags) {
+	if (flags.format !== "json") return null;
+	if (flags.preview) return new UpgradeUsageError({ message: "--format json cannot be combined with --preview; use --check, --yes, or --dry-run" });
+	if (!flags.check && !flags.yes && !flags.dryRun) return new UpgradeUsageError({ message: "--format json requires a non-interactive mode: combine it with --check, --yes, or --dry-run" });
 	return null;
 }
 /**
@@ -607,7 +607,9 @@ const catalogOption = Flag.String("catalog").pipe(Flag.withDescription("Only upg
 const previewFlag = Flag.Boolean("preview").pipe(Flag.withDescription("Print the default picks as a summary and exit"), Flag.withDefault(false));
 const fullFlag = Flag.Boolean("full").pipe(Flag.withDescription("Include up-to-date packages in a printed summary"), Flag.withDefault(false));
 const checkFlag = Flag.Boolean("check").pipe(Flag.withDescription("Exit 1 when --yes would change anything (a drift gate; never writes)"), Flag.withDefault(false));
-const jsonFlag = Flag.Boolean("json").pipe(Flag.withDescription("Print one JSON document on stdout (with --check, --yes or --dry-run)"), Flag.withDefault(false));
+const formatFlag = CliFormat.flag(["auto", "json"], { description: "Output format: auto (for whoever is reading) or json (one JSON document on stdout, with --check, --yes or --dry-run)" });
+/** JSON mode writes one single-line document, so a bash gate can pipe it straight into jq. */
+const ONE_LINE = { indent: 0 };
 /**
 * The "upgrade" command. The default path runs the interactive table;
 * --yes applies latest-in-range non-interactively; --dry-run runs the identical
@@ -624,10 +626,10 @@ const upgradeCommand = Command.make("upgrade", {
 	preview: previewFlag,
 	full: fullFlag,
 	check: checkFlag,
-	json: jsonFlag
-}, ({ file: fileOpt, yes, dryRun, catalog, preview, full, check, json }) => Effect.gen(function* () {
-	const jsonRejection = validateJsonMode({
-		json,
+	format: formatFlag
+}, ({ file: fileOpt, yes, dryRun, catalog, preview, full, check, format }) => Effect.gen(function* () {
+	const jsonRejection = validateFormatMode({
+		format,
 		check,
 		yes,
 		dryRun,
@@ -644,26 +646,28 @@ const upgradeCommand = Command.make("upgrade", {
 	})), Effect.result);
 	if (check) {
 		const result = yield* nonInteractive(true);
-		if (json) {
-			const o = checkJsonOutcome(result);
-			yield* Console.log(o.json);
-			if (o.failure !== void 0) return yield* Effect.fail(o.failure);
-			return yield* CliExit.set(o.exitCode);
-		}
-		if (Result.isFailure(result)) {
-			const { message, kind } = result.failure;
-			return yield* Effect.fail(new CheckFailedError({
-				message,
-				...kind !== void 0 ? { kind } : {}
-			}));
+		const json = checkJsonOutcome(result);
+		const failure = json.failure;
+		if (failure !== void 0) {
+			if (format === "json") yield* CliFormat.print("json", {
+				doc: () => failure[CliDoc](),
+				json: () => json.data
+			}, ONE_LINE);
+			return yield* Effect.fail(failure);
 		}
-		const outcome = checkOutcome(result.success.changed);
-		yield* Doc.print(outcome.doc);
+		const outcome = checkOutcome(Result.isSuccess(result) ? result.success.changed : []);
+		yield* CliFormat.print(format, {
+			doc: () => outcome.doc,
+			json: () => json.data
+		}, ONE_LINE);
 		return yield* CliExit.set(outcome.exitCode);
 	}
-	if (json) {
+	if (format === "json") {
 		const o = upgradeJsonOutcome(yield* nonInteractive(false), dryRun);
-		yield* Console.log(o.json);
+		yield* CliFormat.print("json", {
+			doc: () => [],
+			json: () => o.data
+		}, ONE_LINE);
 		if (o.failure !== void 0) return yield* Effect.fail(o.failure);
 		return;
 	}
@@ -687,7 +691,7 @@ const upgradeCommand = Command.make("upgrade", {
 			workspaceResolver,
 			onProgress: resolveProgress(report)
 		}));
-		yield* dryRun ? CliMessage.info(`Dry run — no changes written. ${result.updated} package(s) would be updated; skipped ${result.skipped.length}.`) : CliMessage.success(`Updated ${result.updated} package(s); skipped ${result.skipped.length}.`);
+		yield* dryRun ? CliMessage.info(`Dry run — no changes written. ${Fmt.plural(result.updated, "package")} would be updated; skipped ${result.skipped.length}.`) : CliMessage.success(`Updated ${Fmt.plural(result.updated, "package")}; skipped ${result.skipped.length}.`);
 		if (result.conflicts.length > 0) {
 			const lines = result.conflicts.map((c) => `  ${c.pkg} (kept ${c.ceiling}) blocked by ${c.blockedBy}`);
 			yield* Doc.print(warningDoc(["Interop conflicts (left at your pick):", ...lines].join("\n")), { stream: "stderr" });
@@ -759,8 +763,8 @@ const upgradeCommand = Command.make("upgrade", {
 	yield* Doc.print(summaryDoc(decisions, { conflicts: allConflicts }, rejected));
 	if (!dryRun) yield* applyInteropAndDecisions(file, source, accepted, interopEdits);
 	const changed = countChangedDecisions(nonInteropDecisions.filter((d) => acceptedPkgs.has(d.item.entry.pkg))) + interopChanged;
-	yield* dryRun ? CliMessage.info(`Dry run — no changes written. ${changed} change(s) would be applied.`) : CliMessage.success(`Applied ${changed} change(s).`);
+	yield* dryRun ? CliMessage.info(`Dry run — no changes written. ${Fmt.plural(changed, "change")} would be applied.`) : CliMessage.success(`Applied ${Fmt.plural(changed, "change")}.`);
 	yield* warnUnresolved(versions.unresolved);
 })).pipe(Command.withDescription("Upgrade catalog versions in a config file"));
 
-export { CHECK_FAILED_LABEL, CheckFailedError, UpgradeError, UpgradeUsageError, applyInteropAndDecisions, checkJsonOutcome, checkOutcome, computeGate, countChangedDecisions, nothingToUpgradeMessage, projectDecisions, readCatalogSource, resolveGatedVersions, resolveProgress, resolveTargetFile, runUpgrade, runUpgradePreview, unresolvedMessage, upgradeCommand, upgradeJsonOutcome, validateJsonMode };
+export { CHECK_FAILED_LABEL, CheckFailedError, UpgradeError, UpgradeUsageError, applyInteropAndDecisions, checkJsonOutcome, checkOutcome, computeGate, countChangedDecisions, nothingToUpgradeMessage, projectDecisions, readCatalogSource, resolveGatedVersions, resolveProgress, resolveTargetFile, runUpgrade, runUpgradePreview, unresolvedMessage, upgradeCommand, upgradeJsonOutcome, validateFormatMode };

package/cli/exit-codes.js

@@ -0,0 +1,16 @@
+// src/cli/exit-codes.ts
+/**
+* Exit codes by failure tag, handed to `CliRuntime.main`'s `exitCodes`. A
+* typed failure whose `_tag` is a key here exits with that code; every other
+* failure falls back to 1. The kit owns the remaining codes: a parse-time
+* usage error is 64 (`usageExitCode`) and a cancelled screen is 130.
+*
+* `UpgradeUsageError` is the command's own invalid flag combination (`--format
+* json` outside `--check`/`--yes`/`--dry-run`), so it shares the parser's 64
+* (BSD `EX_USAGE`) rather than a resolution failure's 1.
+*
+* @internal
+*/
+const EXIT_CODES = { UpgradeUsageError: 64 };
+
+export { EXIT_CODES };

package/cli/load-config.js

@@ -1,6 +1,7 @@
 import { parseWorkspace } from "./workspace-file.js";
 import { evaluatePluginConfig } from "./evaluate.js";
 import { Effect, Predicate } from "effect";
+import { Fmt } from "@effected/cli";
 import { existsSync, readFileSync } from "node:fs";
 
 // src/cli/load-config.ts
@@ -24,7 +25,7 @@ function loadConfigAndWorkspace(opts, mkError) {
 		const path = opts.workspacePath;
 		const parsed = existsSync(path) ? yield* Effect.try({
 			try: () => parseWorkspace(readFileSync(path, "utf8")),
-			catch: (e) => mkError(`Cannot read or parse ${path}: ${String(e)}`)
+			catch: (e) => mkError(`Cannot read or parse ${path}: ${Fmt.causeMessage(e) ?? Fmt.describe(e)}`)
 		}) : {};
 		return {
 			config,

package/cli/main.js

@@ -1,16 +1,19 @@
 import { WorkingDirectory } from "./cwd.js";
+import { EXIT_CODES } from "./exit-codes.js";
 import { RegistryResolverLive } from "./resolve.js";
 import { rootCommand } from "./root.js";
 import { CLI_VERSION } from "./version.js";
 import { Effect } from "effect";
-import { NodeRuntime, NodeServices } from "@effect/platform-node";
 import { CliAudience, CliRuntime } from "@effected/cli";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
 
 // src/cli/main.ts
 /**
 * Assemble and run the CLI. One of the three files allowed to read `process`:
-* the working directory, argv for the build-time log format, and stderr's
-* terminal state are read here and passed down as plain values.
+* the working directory and argv for the build-time log format are read here
+* and passed down as plain values. Stderr's terminal state is not: the
+* platform's `Stdio` (in `NodeServices.layer`) answers it, which is where the
+* kit reads it from when `env.stderrIsTerminal` is omitted.
 *
 * The registry resolver (`pnpm view`, spawned through the platform) is
 * provided here, at the edge, so a test drives the same command tree against
@@ -18,7 +21,8 @@ import { CliAudience, CliRuntime } from "@effected/cli";
 *
 * `CliRuntime.main` builds the audience, terminal and theme from `env`,
 * decides whether the run may prompt, reports every failure on stderr for the
-* run's audience, and maps the exit code (usage 64, cancel 130, otherwise 1).
+* run's audience, and maps the exit code (usage 64, cancel 130, `EXIT_CODES`
+* by tag, otherwise 1).
 *
 * @internal
 */
@@ -27,13 +31,13 @@ function main() {
 	NodeRuntime.runMain(CliRuntime.main(program, {
 		platform: NodeServices.layer,
 		helpOnUsageError: "stderr",
+		exitCodes: EXIT_CODES,
 		env: {
 			audienceEnvVar: "ROLLDOWN_PNPM_CONFIG_AUDIENCE",
 			log: {
 				envVar: "ROLLDOWN_PNPM_CONFIG_LOG_LEVEL",
 				argv: process.argv.slice(2)
-			},
-			stderrIsTerminal: Effect.sync(() => process.stderr.isTTY === true)
+			}
 		}
 	}));
 }

package/cli/resolve.js

@@ -1,4 +1,5 @@
 import { Context, Data, Effect, Layer, Predicate } from "effect";
+import { Fmt } from "@effected/cli";
 import { ChildProcess, ChildProcessSpawner } from "effect/process";
 
 // src/cli/resolve.ts
@@ -85,7 +86,7 @@ const RegistryResolverLive = Layer.effect(RegistryResolver, Effect.gen(function*
 		"--json"
 	])).pipe(Effect.map(stripPnpmNotices), Effect.mapError((e) => new ResolveError({
 		pkg,
-		message: String(e)
+		message: Fmt.causeMessage(e) ?? Fmt.describe(e)
 	})));
 	return {
 		versions: (pkg) => pnpmView(pkg, pkg, "versions").pipe(Effect.flatMap((out) => parseVersions(pkg, out))),

package/cli/select-file.js

@@ -1,27 +1,33 @@
 import { discoverCatalogEntries } from "./discover.js";
-import { Effect } from "effect";
-import { readFileSync, readdirSync } from "node:fs";
+import { Effect, Result } from "effect";
 import { join } from "node:path";
+import { GlobPattern, GlobPatternOptions } from "@effected/glob";
+import { descendSync } from "@effected/walker";
+import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
+import { readFileSync } from "node:fs";
 
 // src/cli/select-file.ts
+/** Top-level `.ts` FILES of a directory, no dotfiles, sorted. */
+const TS_FILES = Result.getOrThrow(GlobPattern.compileResult("*.ts", GlobPatternOptions.make({ dot: false })));
 /**
 * Scan a directory for top-level `.ts` files whose source contains a usable
 * `PnpmConfigPlugin(...)` catalog (discovery yields at least one entry). Read
-* or parse failures are skipped silently. Returns absolute-or-joined paths.
+* or parse failures are skipped silently, and so is an unreadable directory.
+* Returns joined paths in sorted order (`@effected/walker`'s `descendSync`),
+* so a "multiple config files" report lists them the same way on every
+* filesystem.
 *
 * @internal
 */
 function findConfigFiles(dir) {
 	return Effect.sync(() => {
-		let names;
-		try {
-			names = readdirSync(dir);
-		} catch {
-			return [];
-		}
+		const names = Result.getOrElse(descendSync(TS_FILES, {
+			cwd: dir,
+			...nodeWalkerSyncOps
+		}), () => []);
 		const matches = [];
 		for (const name of names) {
-			if (!name.endsWith(".ts") || name.endsWith(".d.ts")) continue;
+			if (name.endsWith(".d.ts")) continue;
 			const path = join(dir, name);
 			try {
 				const source = readFileSync(path, "utf8");

package/cli/summary.js

@@ -1,6 +1,6 @@
 import { row, tone } from "./render/tone.js";
 import { cellTone, displayCandidates, peerFor, tableLayout } from "./walk-reducer.js";
-import { Doc } from "@effected/cli";
+import { Doc, Fmt } from "@effected/cli";
 
 // src/cli/summary.ts
 /**
@@ -27,7 +27,7 @@ function summaryDoc(decisions, interop, rejected) {
 			lines.push(row(" ", 0, [tone(`── catalog: ${entry.catalog} ──`, "unchanged")]));
 		}
 		const cells = displayCandidates(item);
-		const content = [tone(entry.pkg.padEnd(pkgWidth + 2), "plain")];
+		const content = [tone(Fmt.pad(entry.pkg, pkgWidth + 2), "plain")];
 		for (const c of cells) {
 			const selected = c.kind === chosen.kind;
 			content.push(tone(cellText(c, selected), cellTone(c, selected) ?? "unchanged"));

package/cli/ui/walk-screen.js

@@ -1,6 +1,6 @@
 import { TONES } from "../render/tone.js";
 import { computeGroupPeers } from "../interop-live.js";
-import { cellTone, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep, truncateEnd } from "../walk-reducer.js";
+import { cellTone, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep } from "../walk-reducer.js";
 import { Fmt } from "@effected/cli";
 import { KeyHelp, KeyTable, Styled, useKeys, useTerminalSize } from "@effected/cli/ui";
 import { Box, Text } from "ink";
@@ -104,7 +104,7 @@ function makeWalkScreen(props) {
 				const gp = interopPeers.get(item.entry.catalog);
 				const peerText = gp?.peer.get(item.entry.pkg) ?? (chosen === void 0 ? "—" : peerFor(item, chosen));
 				const conflict = gp?.conflict.get(item.entry.pkg);
-				const room = Math.max(8, columns - fixedPrefix - peerText.length - 3);
+				const room = Math.max(8, columns - fixedPrefix - Fmt.width(peerText) - 3);
 				rows.push(/* @__PURE__ */ jsxs(Text, {
 					wrap: "truncate-end",
 					children: [
@@ -114,7 +114,7 @@ function makeWalkScreen(props) {
 						}) : "  ",
 						/* @__PURE__ */ jsx(Text, {
 							bold: onCursor,
-							children: Fmt.sanitize(item.entry.pkg).padEnd(pkgWidth + 2)
+							children: Fmt.pad(Fmt.sanitize(item.entry.pkg), pkgWidth + 2)
 						}),
 						candidates.map((c, ci) => {
 							const t = cellTone(c, ci === pick);
@@ -131,11 +131,11 @@ function makeWalkScreen(props) {
 						}),
 						conflict ? /* @__PURE__ */ jsx(Styled, {
 							token: "failure",
-							children: truncateEnd(`  ⚠ needs ${Fmt.sanitize(conflict)}`, room)
+							children: Fmt.truncate(`  ⚠ needs ${Fmt.sanitize(conflict)}`, room)
 						}) : null,
 						item.peerWarning ? /* @__PURE__ */ jsx(Styled, {
 							token: "failure",
-							children: truncateEnd(`  ⚠ ${Fmt.sanitize(item.peerWarning.message)}`, room)
+							children: Fmt.truncate(`  ⚠ ${Fmt.sanitize(item.peerWarning.message)}`, room)
 						}) : null
 					]
 				}, `${item.entry.catalog}/${item.entry.pkg}`));

package/cli/version.js

@@ -6,6 +6,6 @@
 *
 * @internal
 */
-const CLI_VERSION = "2.1.7";
+const CLI_VERSION = "2.2.0";
 
 export { CLI_VERSION };

package/cli/walk-reducer.js

@@ -1,3 +1,5 @@
+import { Fmt } from "@effected/cli";
+
 // src/cli/walk-reducer.ts
 const ORDER = {
 	keep: 0,
@@ -17,35 +19,25 @@ const BUBBLE_WIDTH = 2;
 * Compute the table geometry once for a set of rows. The range and the major
 * suffix are padded TOGETHER so a major annotation never shifts a later
 * column, and every row emits `maxCells` cells so the peer separator lands
-* in the same column regardless of how many candidates a row has.
+* in the same column regardless of how many candidates a row has. Widths are
+* terminal columns (`Fmt.width`) and padding is `Fmt.pad`, so a wide character
+* in a name or range keeps every later column aligned.
 *
 * @internal
 */
 function tableLayout(items) {
 	const cells = items.map(displayCandidates);
-	const pkgWidth = items.length ? Math.max(...items.map((i) => i.entry.pkg.length)) : 0;
-	const cellWidth = items.length ? Math.max(...cells.flatMap((cs) => cs.map((c) => c.range.length + (c.isMajor ? 8 : 0)))) : 0;
+	const pkgWidth = items.length ? Math.max(...items.map((i) => Fmt.width(i.entry.pkg))) : 0;
+	const cellWidth = items.length ? Math.max(...cells.flatMap((cs) => cs.map((c) => Fmt.width(`${c.range}${c.isMajor ? MAJOR_SUFFIX : ""}`)))) : 0;
 	return {
 		pkgWidth,
 		cellWidth,
 		maxCells: items.length ? Math.max(...cells.map((cs) => cs.length)) : 0,
 		blankCell: `${" ".repeat(BUBBLE_WIDTH + cellWidth)}  `,
-		cellText: (c, selected) => `${selected ? "●" : "○"} ${`${c.range}${c.isMajor ? MAJOR_SUFFIX : ""}`.padEnd(cellWidth)}  `
+		cellText: (c, selected) => `${selected ? "●" : "○"} ${Fmt.pad(`${c.range}${c.isMajor ? MAJOR_SUFFIX : ""}`, cellWidth)}  `
 	};
 }
 /**
-* Truncate `s` to at most `max` display columns, appending `…` when clipped.
-* Keeps a long peer-conflict annotation from wrapping and breaking the table's
-* column alignment. A `max` of 1 or less yields just the ellipsis.
-*
-* @internal
-*/
-function truncateEnd(s, max) {
-	if (s.length <= max) return s;
-	if (max <= 1) return "…";
-	return `${s.slice(0, max - 1)}…`;
-}
-/**
 * The row's options in display order: keep first (always index 0, always the
 * default), then the in-range bump, then the latest-overall bump. `planEntry`
 * emits them in the opposite order, with keep last.
@@ -146,4 +138,4 @@ function cellTone(candidate, selected) {
 	return candidate.isMajor ? "changed" : "added";
 }
 
-export { MAJOR_SUFFIX, cellTone, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep, truncateEnd };
+export { MAJOR_SUFFIX, cellTone, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep };

package/cli/workspace-file.js

@@ -1,6 +1,6 @@
 import { Result } from "effect";
-import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { existsSync } from "node:fs";
 import { Yaml, YamlStringifyOptions } from "@effected/yaml";
 
 // src/cli/workspace-file.ts

package/cli/workspace-resolve.js

@@ -1,9 +1,12 @@
 import { parseVersion } from "../semver-util.js";
 import { findWorkspaceFile } from "./workspace-file.js";
 import { ResolveError } from "./resolve.js";
-import { Effect, Layer } from "effect";
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { Effect, Layer, Result } from "effect";
 import { dirname, join, resolve } from "node:path";
+import { GlobPattern, GlobPatternOptions } from "@effected/glob";
+import { descendSync } from "@effected/walker";
+import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
+import { readFileSync } from "node:fs";
 import { getWorkspacePackagesSync } from "@effected/workspaces";
 import { nodeSyncOps } from "@effected/workspaces/node-sync";
 
@@ -13,6 +16,8 @@ const BUMP_ORDER = {
 	minor: 1,
 	major: 2
 };
+/** The changeset files of `.changeset/`: top-level `.md` FILES, no dotfiles, sorted. */
+const CHANGESET_FILES = Result.getOrThrow(GlobPattern.compileResult("*.md", GlobPatternOptions.make({ dot: false })));
 /** Matches one changeset frontmatter line: `"@scope/name": minor` (quotes optional). */
 const FRONTMATTER_LINE_RE = /^\s*["']?([^"':\s]+)["']?\s*:\s*(major|minor|patch)\s*$/;
 /**
@@ -62,13 +67,10 @@ function readManifests(rootDir) {
 function readPendingBumps(rootDir) {
 	const out = /* @__PURE__ */ new Map();
 	const dir = join(rootDir, ".changeset");
-	if (!existsSync(dir)) return out;
-	let names;
-	try {
-		names = readdirSync(dir).filter((n) => n.endsWith(".md") && n !== "README.md");
-	} catch {
-		return out;
-	}
+	const names = Result.getOrElse(descendSync(CHANGESET_FILES, {
+		cwd: dir,
+		...nodeWalkerSyncOps
+	}), () => []).filter((n) => n !== "README.md");
 	for (const name of names) {
 		let text;
 		try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "2.1.7",
+	"version": "2.2.0",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -36,17 +36,17 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "^4.0.6",
-		"@effected/cli": "^0.22.2",
-		"@effected/env": "^0.5.0",
-		"@effected/glob": "^0.14.0",
-		"@effected/npm": "^0.27.0",
+		"@effected/cli": "^0.23.0",
+		"@effected/env": "^0.6.0",
+		"@effected/glob": "^0.15.0",
+		"@effected/npm": "^0.27.1",
 		"@effected/semver": "^0.18.0",
-		"@effected/walker": "^0.20.1",
-		"@effected/workspaces": "^0.39.0",
+		"@effected/walker": "^0.21.0",
+		"@effected/workspaces": "^0.39.1",
 		"@effected/yaml": "^0.25.1",
 		"effect": "^4.0.6",
 		"ink": "^8.0.0",
-		"oxc-parser": "^0.155.0",
+		"oxc-parser": "^0.156.0",
 		"react": "^19.3.1"
 	},
 	"peerDependencies": {

package/patches/discover.js

@@ -1,14 +1,26 @@
 import { patchKeyFromFileName } from "./keys.js";
 import { distributedPatchPath, distributedRel } from "./paths.js";
-import { existsSync, readdirSync } from "node:fs";
+import { Result } from "effect";
 import { isAbsolute, join } from "node:path";
+import { GlobPattern, GlobPatternOptions } from "@effected/glob";
+import { descendSync } from "@effected/walker";
+import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 
 // src/patches/discover.ts
 /**
+* The patch files of one convention folder: top-level `.patch` FILES only
+* (a directory named `x.patch` is not a patch), no dotfiles, sorted.
+*/
+const PATCH_FILES = Result.getOrThrow(GlobPattern.compileResult("*.patch", GlobPatternOptions.make({ dot: false })));
+/**
 * Discover owned patches in the two convention folders adjacent to the build
 * file: `public/patches/` (distributed, rewritten) and `patches/` (local-only).
 * `localPatchesDir` overrides the distributed source root only. Read-only.
 *
+* Each folder is listed with `@effected/walker`'s `descendSync`: an absent
+* folder yields nothing, and an unreadable one throws its `DescendError`, as
+* the bare `readdirSync` this replaced threw its `EACCES`.
+*
 * @internal
 */
 function discoverPatches(opts) {
@@ -19,8 +31,11 @@ function discoverPatches(opts) {
 	collect(localOnlyRoot, false);
 	return out;
 	function collect(dir, distributed) {
-		if (!existsSync(dir)) return;
-		for (const fileName of readdirSync(dir).sort()) {
+		const files = Result.getOrThrow(descendSync(PATCH_FILES, {
+			cwd: dir,
+			...nodeWalkerSyncOps
+		}));
+		for (const fileName of files) {
 			const key = patchKeyFromFileName(fileName);
 			if (key === null) continue;
 			const absPath = join(dir, fileName);

package/plugin/freeze.js

@@ -4,6 +4,7 @@ import { FIELD_REGISTRY } from "../registry.js";
 import { resolvePeerDependencyRules } from "./allowed-versions.js";
 import { resolveOverrides } from "./overrides-from-catalogs.js";
 import { Data, Effect, Schema } from "effect";
+import { Fmt } from "@effected/cli";
 
 // src/plugin/freeze.ts
 /**
@@ -57,13 +58,13 @@ function freeze(config) {
 	return Effect.gen(function* () {
 		const base = {};
 		const manifest = {};
-		base.catalogs = yield* Schema.decodeUnknownEffect(CatalogsSchema)(normalizeCatalogs(config.catalogs)).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid catalogs: ${String(error)}` })));
+		base.catalogs = yield* Schema.decodeUnknownEffect(CatalogsSchema)(normalizeCatalogs(config.catalogs)).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid catalogs: ${Fmt.describe(error)}` })));
 		manifest.catalogs = {
 			strategy: "catalogs",
 			enforcement: "warn"
 		};
 		if (typeof config.name !== "string" || config.name.trim() === "") return yield* Effect.fail(new ConfigError({ message: "Config `name` is required and must be a non-empty string" }));
-		const directiveError = (error) => new ConfigError({ message: error instanceof Error ? error.message : String(error) });
+		const directiveError = (error) => new ConfigError({ message: Fmt.describe(error) });
 		for (const [field, reg] of Object.entries(FIELD_REGISTRY)) {
 			if (field === "catalogs") continue;
 			let raw = config[field];
@@ -78,7 +79,7 @@ function freeze(config) {
 				try: () => resolveOverrides(decl.value, config.overridesFromCatalogs, config.catalogs),
 				catch: directiveError
 			}) : decl.value;
-			base[field] = schema ? yield* Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid ${field}: ${String(error)}` }))) : value;
+			base[field] = schema ? yield* Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid ${field}: ${Fmt.describe(error)}` }))) : value;
 			manifest[field] = {
 				strategy: reg.strategy,
 				enforcement: decl.enforcement ?? reg.enforcement,

package/runtime/ctx.js

@@ -1,5 +1,5 @@
-import { readFileSync } from "node:fs";
 import { join } from "node:path";
+import { readFileSync } from "node:fs";
 
 // src/runtime/ctx.ts
 /**