@rrlab/cli 1.3.4 → 1.3.6-git-c9903ab.0

package/README.md

@@ -8,7 +8,7 @@
 
 ## Prerequisites
 
-- Node.js >= 20.0.0
+- Node.js >= 22.18.0
 
 ## Installation
 
@@ -40,6 +40,7 @@ See [`CLI.md`](./CLI.md) for the full reference (auto-generated per release).
 | `oxc`    | [oxlint](https://oxc.rs/docs/guide/usage/linter.html) + [oxfmt](https://oxc.rs/docs/guide/usage/formatter.html) | `rr plugins add oxc`     |
 | `ts`     | [tsc](https://www.typescriptlang.org)                                                                          | `rr plugins add ts`      |
 | `tsdown` | [tsdown](https://tsdown.dev)                                                                                   | `rr plugins add tsdown`  |
+| `vitest` | [vitest](https://vitest.dev)                                                                                   | `rr plugins add vitest`  |
 
 Install one with:
 
@@ -79,19 +80,23 @@ _.path = ["{{config_root}}/node_modules/.bin"]
 PATH_add node_modules/.bin
 ```
 
-Then add a guarded eval to your shell rc — the guard makes it a no-op when you open a shell outside any project:
+Then add a guarded eval to your shell rc:
 
 ```sh
 # zsh — ~/.zshrc
-command -v rr >/dev/null 2>&1 && eval "$(rr completion zsh)"
+command -v rr >/dev/null 2>&1 && eval "$(rr completion zsh 2>/dev/null)"
 
 # bash — ~/.bashrc
-command -v rr >/dev/null 2>&1 && eval "$(rr completion bash)"
+command -v rr >/dev/null 2>&1 && eval "$(rr completion bash 2>/dev/null)"
 
 # fish — ~/.config/fish/config.fish
-command -v rr >/dev/null 2>&1; and rr completion fish | source
+command -v rr >/dev/null 2>&1; and rr completion fish 2>/dev/null | source
 ```
 
+The `command -v` guard skips the line when no `rr` is on `PATH`. A mise shim still passes it: recent versions of mise keep `~/.local/share/mise/shims` on `PATH` after `mise activate`, even outside any project (the `activate_shims` setting, on by default). Once mise has installed a tool that provides `rr`, such as `npm:@rrlab/cli` in some project's `mise.toml`, an `rr` shim exists in every directory, and where no version is active it fails with `mise ERROR No version is set for shim: rr` on stderr. The `2>/dev/null` discards that error, so the line stays silent outside a project.
+
+The line hides every error, so if completion doesn't load, run `rr completion zsh` by hand to see why.
+
 ### Option B — without a per-project PATH manager
 
 Cache the completion script once, then source the cached file from your shell rc. Run the generation step from inside a project that has `@rrlab/cli` installed:

package/dist/cli.usage.kdl

@@ -1,7 +1,7 @@
 // @generated by @usage-spec/commander from Commander.js metadata
 name rr
 bin rr
-version "1.3.4"
+version "1.3.6-git-c9903ab.0"
 usage "[options] [command]"
 flag --about help="show credits & inspiration"
 flag --usage help="print KDL spec for this CLI (https://kdl.dev)"
@@ -52,7 +52,7 @@ cmd doctor help="run all plugin doctors" {
 	long_help "Runs the `doctor()` of every configured plugin capability. Each plugin reports ok / not working. The exit code is non-zero if any reports not working."
 }
 cmd completion help="print shell completion script" {
-	long_help "Prints a shell completion script for rr. Add to your shell rc file:\n\n  bash: eval \"$(rr completion bash)\"\n  zsh:  eval \"$(rr completion zsh)\"\n  fish: rr completion fish | source"
+	long_help "Prints a shell completion script for rr. Add your shell's line to its rc file:\n\n    # bash — ~/.bashrc\n    command -v rr >/dev/null 2>&1 && eval \"$(rr completion bash 2>/dev/null)\"\n\n    # zsh — ~/.zshrc\n    command -v rr >/dev/null 2>&1 && eval \"$(rr completion zsh 2>/dev/null)\"\n\n    # fish — ~/.config/fish/config.fish\n    command -v rr >/dev/null 2>&1; and rr completion fish 2>/dev/null | source"
 	arg <shell> help="target shell" {
 		choices bash zsh fish
 	}

package/dist/plugin/__tests__/bin-probe.test.mjs

@@ -1,6 +1,6 @@
 import { ToolService } from "../tool-service.mjs";
 import { probeBins } from "../bin-probe.mjs";
-import { i as it, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-CipsEAq5.mjs";
+import { i as it, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-Bszob22e.mjs";
 //#region src/lib/plugin/__tests__/bin-probe.test.ts
 const FROM = import.meta.url;
 var ResolvableService = class extends ToolService {

package/dist/plugin/__tests__/decide-scaffold.test.mjs

@@ -1,5 +1,5 @@
 import { decideScaffold } from "../decide-scaffold.mjs";
-import { i as it, n as vi, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-CipsEAq5.mjs";
+import { i as it, n as vi, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-Bszob22e.mjs";
 //#region src/lib/plugin/__tests__/decide-scaffold.test.ts
 function makeCtx(overrides = {}) {
 	return {

package/dist/plugin/__tests__/define-plugin.test.mjs

@@ -1,6 +1,6 @@
 import { ToolService } from "../tool-service.mjs";
 import { definePlugin } from "../define-plugin.mjs";
-import { i as it, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-CipsEAq5.mjs";
+import { i as it, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-Bszob22e.mjs";
 //#region src/lib/plugin/__tests__/define-plugin.test.ts
 function ctx() {
 	return {

package/dist/plugin/__tests__/pick-preset.test.mjs

@@ -1,5 +1,5 @@
 import { pickPreset } from "../pick-preset.mjs";
-import { i as it, n as vi, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-CipsEAq5.mjs";
+import { i as it, n as vi, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-Bszob22e.mjs";
 //#region src/lib/plugin/__tests__/pick-preset.test.ts
 function makeCtx(overrides = {}) {
 	return {

package/dist/plugin/__tests__/registry.test.mjs

@@ -1,5 +1,5 @@
 import { t as PluginRegistry } from "../../registry-B-GhzVIO.mjs";
-import { i as it, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-CipsEAq5.mjs";
+import { i as it, r as describe, t as globalExpect } from "../../test.DNmyFkvJ-Bszob22e.mjs";
 //#region src/lib/plugin/__tests__/registry.test.ts
 function plugin(name) {
 	return {

package/dist/run.mjs

@@ -12,7 +12,7 @@ import { rimraf } from "rimraf";
 import * as clack from "@clack/prompts";
 import { addDependency, detectPackageManager, removeDependency } from "nypm";
 import fs$1 from "node:fs/promises";
-import { builders, generateCode, loadFile, parseModule, writeFile } from "magicast";
+import { builders, generateCode, loadFile, parseModule } from "magicast";
 import * as cjson from "comment-json";
 import { generateToStdout } from "@usage-spec/commander";
 //#region src/errors/known-error.ts
@@ -622,11 +622,16 @@ const SHELLS = [
 ];
 const usageColor = colorize("#24C55E");
 function createCompletionCommand() {
-	return createCommand("completion").summary(`print shell completion script`).description(`Prints a shell completion script for rr. Add to your shell rc file:
+	return createCommand("completion").summary(`print shell completion script`).description(`Prints a shell completion script for rr. Add your shell's line to its rc file:
 
-  bash: eval "$(rr completion bash)"
-  zsh:  eval "$(rr completion zsh)"
-  fish: rr completion fish | source`).addArgument(new Argument("<shell>", `target shell`).choices(SHELLS)).addHelpText("afterAll", `\nUnder the hood, this command uses ${usageColor("usage")} (https://usage.jdx.dev).
+    # bash — ~/.bashrc
+    command -v rr >/dev/null 2>&1 && eval "$(rr completion bash 2>/dev/null)"
+
+    # zsh — ~/.zshrc
+    command -v rr >/dev/null 2>&1 && eval "$(rr completion zsh 2>/dev/null)"
+
+    # fish — ~/.config/fish/config.fish
+    command -v rr >/dev/null 2>&1; and rr completion fish 2>/dev/null | source`).configureHelp({ helpWidth: Number.POSITIVE_INFINITY }).addArgument(new Argument("<shell>", `target shell`).choices(SHELLS)).addHelpText("afterAll", `\nUnder the hood, this command uses ${usageColor("usage")} (https://usage.jdx.dev).
 Make sure to have it installed and available in your PATH.`);
 }
 //#endregion
@@ -948,12 +953,7 @@ var ConfigAstService = class {
 		};
 	}
 	async save(loaded) {
-		if (loaded.isNew) {
-			const { code } = generateCode(loaded.mod);
-			await fs$1.writeFile(loaded.filepath, code, "utf8");
-			return;
-		}
-		await writeFile(loaded.mod.$ast, loaded.filepath);
+		await fs$1.writeFile(loaded.filepath, tidy(generateCode(loaded.mod).code), "utf8");
 	}
 	/**
 	* Returns true when the config's `plugins` array contains a call to the
@@ -974,11 +974,14 @@ var ConfigAstService = class {
 	*/
 	addPlugin(mod, entry) {
 		if (this.hasPlugin(mod, entry.exportName)) return { changed: false };
-		if (!mod.imports[entry.exportName]) mod.imports.$add({
-			from: entry.pkgName,
-			imported: "default",
-			local: entry.exportName
-		});
+		if (!mod.imports[entry.exportName]) {
+			mod.imports.$add({
+				from: entry.pkgName,
+				imported: "default",
+				local: entry.exportName
+			});
+			this.#placeImport(mod, entry.pkgName);
+		}
 		this.#ensureDefineConfig(mod);
 		this.#ensurePluginsArray(mod).push(builders.functionCall(entry.exportName));
 		return { changed: true };
@@ -1023,12 +1026,32 @@ var ConfigAstService = class {
 		if (!opts || typeof opts !== "object") return void 0;
 		return opts.plugins;
 	}
+	/**
+	* Moves the import of `source`, which `imports.$add` puts first, to its
+	* sorted place among the other imports, leaving those in their order: a
+	* sorted file stays sorted, so `rr jsc` passes on what rr wrote.
+	*/
+	#placeImport(mod, source) {
+		const program = mod.$ast;
+		if (program.type !== "Program") return;
+		const { body } = program;
+		const from = body.findIndex((node) => node.type === "ImportDeclaration" && node.source.value === source);
+		if (from === -1) return;
+		const [added] = body.splice(from, 1);
+		if (!added) return;
+		const before = body.findIndex((node) => node.type === "ImportDeclaration" && compareImportSources(node.source.value, source) > 0);
+		const lastImport = body.reduce((last, node, i) => node.type === "ImportDeclaration" ? i : last, -1);
+		body.splice(before === -1 ? lastImport + 1 : before, 0, added);
+	}
 	#ensureDefineConfig(mod) {
-		if (!mod.imports.defineConfig) mod.imports.$add({
-			from: "@rrlab/cli/config",
-			imported: "defineConfig",
-			local: "defineConfig"
-		});
+		if (!mod.imports.defineConfig) {
+			mod.imports.$add({
+				from: "@rrlab/cli/config",
+				imported: "defineConfig",
+				local: "defineConfig"
+			});
+			this.#placeImport(mod, "@rrlab/cli/config");
+		}
 		if (!mod.exports.default) mod.exports.default = builders.functionCall("defineConfig", { plugins: [] });
 	}
 	#ensurePluginsArray(mod) {
@@ -1049,6 +1072,30 @@ var ConfigAstService = class {
 		if (typeof callee === "string") return callee;
 	}
 };
+/**
+* Undoes two recast habits that formatters reject: it keeps the blank line that
+* followed an import when rr inserts another after it, and it drops the final
+* newline.
+*/
+function tidy(code) {
+	const joined = code.replace(/^(import\b[^;]*;)\n(?:[ \t]*\n)+(?=import\b)/gm, "$1\n");
+	return joined.endsWith("\n") ? joined : `${joined}\n`;
+}
+/**
+* Biome's organizeImports order: protocol imports (`node:fs`), then packages,
+* then aliases (`#src/…`, `@/…`, `~/…`), then paths. Within a group, plain
+* code-unit order, which matches Biome for these names (`ts-plugin` before
+* `tsdown-plugin`; `localeCompare` flips them).
+*/
+function compareImportSources(a, b) {
+	const group = (source) => {
+		if (/^[a-z]+:/.test(source)) return 0;
+		if (/^(#|@\/|~)/.test(source)) return 2;
+		if (source.startsWith(".") || source.startsWith("/")) return 3;
+		return 1;
+	};
+	return group(a) - group(b) || (a < b ? -1 : a > b ? 1 : 0);
+}
 const MINIMAL_TEMPLATE = `import { defineConfig } from "@rrlab/cli/config";
 
 export default defineConfig({
@@ -1248,6 +1295,14 @@ async function pathExists(p) {
 //#endregion
 //#region src/services/prompts.ts
 /**
+* Whether a prompt can run: clack reads keys from stdin and draws on stdout,
+* so both have to be terminals. An agent, a script or CI usually has neither,
+* and a prompt there waits forever or exits on a closed stdin.
+*/
+function canPrompt() {
+	return !!process.stdin.isTTY && !!process.stdout.isTTY;
+}
+/**
 * Adapter that exposes the subset of `@clack/prompts` matching the
 * `ClackPrompts` contract from `@rrlab/cli/plugin`. The contract intentionally
 * stays narrow (`select`, `confirm`, `isCancel`) so plugin install hooks can
@@ -1445,7 +1500,7 @@ async function addPluginAction({ ctx, args, options }) {
 				flags: {
 					force: !!options.force,
 					yes: !!options.yes,
-					nonInteractive: !!options.yes
+					nonInteractive: !!options.yes || !canPrompt()
 				},
 				release: new ReleaseService(tag)
 			};
@@ -1504,6 +1559,13 @@ async function listPluginsAction({ ctx }) {
 	for (const name of plugins) logger.info(`  - ${name}`);
 }
 //#endregion
+//#region src/errors/confirmation-required.ts
+var ConfirmationRequiredError = class extends KnownError {
+	constructor(command) {
+		super(`'${command}' asks for confirmation, and there's no terminal to ask in. Re-run it with --yes.`);
+	}
+};
+//#endregion
 //#region src/actions/plugins/remove.ts
 async function removePluginAction({ ctx, args, options }) {
 	const { name } = args;
@@ -1523,7 +1585,7 @@ async function removePluginAction({ ctx, args, options }) {
 			prompts: createClackPrompts(),
 			flags: {
 				yes: !!options.yes,
-				nonInteractive: !!options.yes
+				nonInteractive: !!options.yes || !canPrompt()
 			}
 		});
 	} catch (err) {
@@ -1552,6 +1614,7 @@ async function removePluginAction({ ctx, args, options }) {
 		return;
 	}
 	if (!options.yes) {
+		if (!canPrompt()) throw new ConfirmationRequiredError(`rr plugins remove ${name}`);
 		const choice = await clack.confirm({
 			message: "Proceed?",
 			initialValue: false

package/dist/{test.DNmyFkvJ-CipsEAq5.mjs → test.DNmyFkvJ-Bszob22e.mjs}

@@ -81,7 +81,7 @@ function C({ force: e } = {}) {
 }
 var y = C();
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+pretty-format@4.1.6/node_modules/@vitest/pretty-format/dist/index.js
+//#region ../../node_modules/.pnpm/@vitest+pretty-format@4.1.12/node_modules/@vitest/pretty-format/dist/index.js
 function _mergeNamespaces(n, m) {
 	m.forEach(function(e) {
 		e && typeof e !== "string" && !Array.isArray(e) && Object.keys(e).forEach(function(k) {
@@ -964,7 +964,7 @@ const plugins = {
 	Error: ErrorPlugin
 };
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/display.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/display.js
 const ansiColors$1 = {
 	bold: ["1", "22"],
 	dim: ["2", "22"],
@@ -1518,7 +1518,7 @@ function objDisplay$1(obj, options = {}) {
 	return str;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/helpers.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/helpers.js
 /**
 * Get original stacktrace without source map support the most performant way.
 * - Create only 1 stack frame.
@@ -3004,7 +3004,7 @@ function getCommonAndChangedSubstrings(diffs, op, hasCommonDiff) {
 	return diffs.reduce((reduced, diff) => reduced + (diff[0] === 0 ? diff[1] : diff[0] === op ? hasCommonDiff ? y.inverse(diff[1]) : diff[1] : ""), "");
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/serialize.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/serialize.js
 const IS_RECORD_SYMBOL$1 = "@@__IMMUTABLE_RECORD__@@";
 const IS_COLLECTION_SYMBOL = "@@__IMMUTABLE_ITERABLE__@@";
 function isImmutable(v) {
@@ -3078,7 +3078,7 @@ function normalizeErrorMessage(message) {
 	return message.replace(/\(0\s?,\s?__vite_ssr_import_\d+__.(\w+)\)/g, "$1").replace(/__(vite_ssr_import|vi_import)_\d+__\./g, "").replace(/getByTestId('__vitest_\d+__')/g, "page");
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/error.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/error.js
 function processError(_err, diffOptions, seen = /* @__PURE__ */ new WeakSet()) {
 	if (!_err || typeof _err !== "object") return { message: String(_err) };
 	const err = _err;
@@ -3108,7 +3108,7 @@ function prettifyValue(value, options) {
 	return value;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/timers.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/timers.js
 const SAFE_TIMERS_SYMBOL = Symbol("vitest:SAFE_TIMERS");
 function getSafeTimers() {
 	const { setTimeout: safeSetTimeout, setInterval: safeSetInterval, clearInterval: safeClearInterval, clearTimeout: safeClearTimeout, setImmediate: safeSetImmediate, clearImmediate: safeClearImmediate, queueMicrotask: safeQueueMicrotask } = globalThis[SAFE_TIMERS_SYMBOL] || globalThis;
@@ -3142,7 +3142,7 @@ function delay(timeout, scheduler = setTimeout) {
 	return new Promise((resolve) => scheduler(resolve, timeout));
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/chunk-pathe.M-eThtNZ.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/chunk-pathe.M-eThtNZ.js
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
 	if (!input) return input;
@@ -3221,7 +3221,7 @@ const isAbsolute = function(p) {
 	return _IS_ABSOLUTE_RE.test(p);
 };
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/source-map.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/source-map.js
 var comma = ",".charCodeAt(0);
 var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 var intToChar = new Uint8Array(64);
@@ -3589,7 +3589,7 @@ function getOriginalPosition(map, needle) {
 	return result;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+runner@4.1.6/node_modules/@vitest/runner/dist/chunk-artifact.js
+//#region ../../node_modules/.pnpm/@vitest+runner@4.1.12/node_modules/@vitest/runner/dist/chunk-artifact.js
 var PendingError = class extends Error {
 	code = "VITEST_PENDING";
 	taskId;
@@ -5092,7 +5092,7 @@ function manageArtifactAttachment(attachment) {
 	if (attachment.body != null) attachment.bodyEncoding ??= "base64";
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.6_@types+node@25.9.1_vite@8.0.13_@types+node@25.9.1_yaml@2.8.4_/node_modules/vitest/dist/chunks/utils.BX5Fg8C4.js
+//#region ../../node_modules/.pnpm/vitest@4.1.12_@types+node@25.9.1_vite@8.3.4_@types+node@25.9.1_yaml@2.9.1_/node_modules/vitest/dist/chunks/utils.BX5Fg8C4.js
 const NAME_WORKER_STATE = "__vitest_worker__";
 function getWorkerState() {
 	const workerState = globalThis[NAME_WORKER_STATE];
@@ -5132,7 +5132,7 @@ async function waitForImportsToResolve() {
 	await waitForImportsToResolve();
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+spy@4.1.6/node_modules/@vitest/spy/dist/index.js
+//#region ../../node_modules/.pnpm/@vitest+spy@4.1.12/node_modules/@vitest/spy/dist/index.js
 function isMockFunction(fn) {
 	return typeof fn === "function" && "_isMockFunction" in fn && fn._isMockFunction === true;
 }
@@ -5515,7 +5515,7 @@ function throwConstructorError(shorthand) {
 	throw new TypeError(`Cannot use \`${shorthand}\` when called with \`new\`. Use \`mockImplementation\` with a \`class\` keyword instead. See https://vitest.dev/api/mock#class-support for more information.`);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/chai@6.2.2/node_modules/chai/index.js
+//#region ../../node_modules/.pnpm/chai@6.3.0/node_modules/chai/index.js
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {
 	enumerable: true,
@@ -5596,6 +5596,7 @@ function compatibleConstructor(thrown, errorLike) {
 __name(compatibleConstructor, "compatibleConstructor");
 function compatibleMessage(thrown, errMatcher) {
 	const comparisonString = typeof thrown === "string" ? thrown : thrown.message;
+	if (comparisonString === void 0) return false;
 	if (isRegExp(errMatcher)) return errMatcher.test(comparisonString);
 	else if (typeof errMatcher === "string") return comparisonString.indexOf(errMatcher) !== -1;
 	return false;
@@ -6252,8 +6253,10 @@ function inspect2(obj, showHidden, depth, colors) {
 __name(inspect2, "inspect");
 function objDisplay(obj) {
 	let str = inspect2(obj), type3 = Object.prototype.toString.call(obj);
-	if (config.truncateThreshold && str.length >= config.truncateThreshold) if (type3 === "[object Function]") return !obj.name || obj.name === "" ? "[Function]" : "[Function: " + obj.name + "]";
-	else if (type3 === "[object Array]") return "[ Array(" + obj.length + ") ]";
+	if (config.truncateThreshold && str.length >= config.truncateThreshold) if (type3 === "[object Function]") {
+		const objAsFunction = obj;
+		return !objAsFunction.name || objAsFunction.name === "" ? "[Function]" : "[Function: " + objAsFunction.name + "]";
+	} else if (type3 === "[object Array]") return "[ Array(" + obj.length + ") ]";
 	else if (type3 === "[object Object]") {
 		let keys = Object.keys(obj);
 		return "{ Object (" + (keys.length > 2 ? keys.splice(0, 2).join(", ") + ", ..." : keys.join(", ")) + ") }";
@@ -6266,25 +6269,24 @@ function getMessage2(obj, args) {
 	let val = flag(obj, "object");
 	let expected = args[3];
 	let actual = getActual(obj, args);
-	let msg = negate ? args[2] : args[1];
+	let rawMsg = negate ? args[2] : args[1];
 	let flagMsg = flag(obj, "message");
-	if (typeof msg === "function") msg = msg();
-	msg = msg || "";
-	msg = msg.replace(/#\{this\}/g, function() {
-		return objDisplay(val);
-	}).replace(/#\{act\}/g, function() {
-		return objDisplay(actual);
-	}).replace(/#\{exp\}/g, function() {
+	if (typeof rawMsg === "function") rawMsg = rawMsg();
+	const msg = (rawMsg || "").replace(/#\{(this|act|exp)\}/g, function(_, tag) {
+		if (tag === "this") return objDisplay(val);
+		if (tag === "act") return objDisplay(actual);
 		return objDisplay(expected);
 	});
 	return flagMsg ? flagMsg + ": " + msg : msg;
 }
 __name(getMessage2, "getMessage");
-function transferFlags(assertion, object, includeAll) {
-	let flags = assertion.__flags || (assertion.__flags = /* @__PURE__ */ Object.create(null));
-	if (!object.__flags) object.__flags = /* @__PURE__ */ Object.create(null);
+function transferFlags(source, object, includeAll) {
+	const sourceWithFlags = source;
+	const objWithFlags = object;
+	let flags = sourceWithFlags.__flags || (sourceWithFlags.__flags = /* @__PURE__ */ Object.create(null));
+	const objFlags = objWithFlags.__flags || (objWithFlags.__flags = /* @__PURE__ */ Object.create(null));
 	includeAll = arguments.length === 3 ? includeAll : true;
-	for (let flag3 in flags) if (includeAll || flag3 !== "object" && flag3 !== "ssfi" && flag3 !== "lockSsfi" && flag3 != "message") object.__flags[flag3] = flags[flag3];
+	for (let flag3 in flags) if (includeAll || flag3 !== "object" && flag3 !== "ssfi" && flag3 !== "lockSsfi" && flag3 != "message") objFlags[flag3] = flags[flag3];
 }
 __name(transferFlags, "transferFlags");
 function type2(obj) {
@@ -6611,9 +6613,9 @@ var _Assertion = class _Assertion {
 	* - `eql`: This flag contains the deepEqual function to be used by the assertion.
 	*
 	* @param {unknown} obj target of the assertion
-	* @param {string} [msg] (optional) custom error message
-	* @param {Function} [ssfi] (optional) starting point for removing stack frames
-	* @param {boolean} [lockSsfi] (optional) whether or not the ssfi flag is locked
+	* @param {string=} msg (optional) custom error message
+	* @param {Function=} ssfi (optional) starting point for removing stack frames
+	* @param {boolean=} lockSsfi (optional) whether or not the ssfi flag is locked
 	*/
 	constructor(obj, msg, ssfi, lockSsfi) {
 		/** @type {{}} */
@@ -6647,44 +6649,44 @@ var _Assertion = class _Assertion {
 	}
 	/**
 	* @param {string} name
-	* @param {Function} fn
+	* @param {(...args: never) => unknown} fn
 	*/
 	static addProperty(name, fn) {
 		addProperty(this.prototype, name, fn);
 	}
 	/**
 	* @param {string} name
-	* @param {Function} fn
+	* @param {(...args: never) => unknown} fn
 	*/
 	static addMethod(name, fn) {
 		addMethod(this.prototype, name, fn);
 	}
 	/**
 	* @param {string} name
-	* @param {Function} fn
-	* @param {Function} chainingBehavior
+	* @param {(...args: never) => unknown} fn
+	* @param {(...args: never) => unknown} chainingBehavior
 	*/
 	static addChainableMethod(name, fn, chainingBehavior) {
 		addChainableMethod(this.prototype, name, fn, chainingBehavior);
 	}
 	/**
 	* @param {string} name
-	* @param {Function} fn
+	* @param {(...args: never) => unknown} fn
 	*/
 	static overwriteProperty(name, fn) {
 		overwriteProperty(this.prototype, name, fn);
 	}
 	/**
 	* @param {string} name
-	* @param {Function} fn
+	* @param {(...args: never) => unknown} fn
 	*/
 	static overwriteMethod(name, fn) {
 		overwriteMethod(this.prototype, name, fn);
 	}
 	/**
 	* @param {string} name
-	* @param {Function} fn
-	* @param {Function} chainingBehavior
+	* @param {(...args: never) => unknown} fn
+	* @param {(...args: never) => unknown} chainingBehavior
 	*/
 	static overwriteChainableMethod(name, fn, chainingBehavior) {
 		overwriteChainableMethod(this.prototype, name, fn, chainingBehavior);
@@ -6741,6 +6743,11 @@ __name(_Assertion, "Assertion");
 var Assertion = _Assertion;
 var events = new EventTarget();
 var _PluginEvent = class _PluginEvent extends Event {
+	/**
+	* @param {string} type
+	* @param {string} name
+	* @param {Function} fn
+	*/
 	constructor(type3, name, fn) {
 		super(type3);
 		this.name = String(name);
@@ -6771,7 +6778,7 @@ function addProperty(ctx, name, getter) {
 __name(addProperty, "addProperty");
 var fnLengthDesc = Object.getOwnPropertyDescriptor(function() {}, "length");
 function addLengthGuard(fn, assertionName, isChainable) {
-	if (!fnLengthDesc.configurable) return fn;
+	if (!fnLengthDesc?.configurable) return fn;
 	Object.defineProperty(fn, "length", { get: /* @__PURE__ */ __name(function() {
 		if (isChainable) throw Error("Invalid Chai property: " + assertionName + ".length. Due to a compatibility issue, \"length\" cannot directly follow \"" + assertionName + "\". Use \"" + assertionName + ".lengthOf\" instead.");
 		throw Error("Invalid Chai property: " + assertionName + ".length. See docs for proper usage of \"" + assertionName + "\".");
@@ -6803,7 +6810,7 @@ function proxify(obj, nonChainableMethodName) {
 	if (!isProxyEnabled()) return obj;
 	return new Proxy(obj, { get: /* @__PURE__ */ __name(function proxyGetter(target, property) {
 		if (typeof property === "string" && config.proxyExcludedKeys.indexOf(property) === -1 && !Reflect.has(target, property)) {
-			if (nonChainableMethodName) throw Error("Invalid Chai property: " + nonChainableMethodName + "." + property + ". See docs for proper usage of \"" + nonChainableMethodName + "\".");
+			if (nonChainableMethodName) throw Error("Invalid Chai property: " + String(nonChainableMethodName) + "." + property + ". See docs for proper usage of \"" + String(nonChainableMethodName) + "\".");
 			let suggestion = null;
 			let suggestionDistance = 4;
 			getProperties(target).forEach(function(prop) {
@@ -6859,7 +6866,8 @@ function addMethod(ctx, name, method) {
 }
 __name(addMethod, "addMethod");
 function overwriteProperty(ctx, name, getter) {
-	let _get = Object.getOwnPropertyDescriptor(ctx, name), _super = /* @__PURE__ */ __name(function() {}, "_super");
+	let _get = Object.getOwnPropertyDescriptor(ctx, name);
+	let _super = /* @__PURE__ */ __name(function() {}, "_super");
 	if (_get && "function" === typeof _get.get) _super = _get.get;
 	Object.defineProperty(ctx, name, {
 		get: /* @__PURE__ */ __name(function overwritingPropertyGetter() {
@@ -6878,11 +6886,12 @@ function overwriteProperty(ctx, name, getter) {
 }
 __name(overwriteProperty, "overwriteProperty");
 function overwriteMethod(ctx, name, method) {
-	let _method = ctx[name], _super = /* @__PURE__ */ __name(function() {
-		throw new Error(name + " is not a function");
+	let _method = ctx[name];
+	let _super = /* @__PURE__ */ __name(function() {
+		throw new Error(String(name) + " is not a function");
 	}, "_super");
 	if (_method && "function" === typeof _method) _super = _method;
-	let overwritingMethodWrapper = /* @__PURE__ */ __name(function() {
+	function overwritingMethodWrapper() {
 		if (!flag(this, "lockSsfi")) flag(this, "ssfi", overwritingMethodWrapper);
 		let origLockSsfi = flag(this, "lockSsfi");
 		flag(this, "lockSsfi", true);
@@ -6892,8 +6901,9 @@ function overwriteMethod(ctx, name, method) {
 		let newAssertion = new Assertion();
 		transferFlags(this, newAssertion);
 		return newAssertion;
-	}, "overwritingMethodWrapper");
-	addLengthGuard(overwritingMethodWrapper, name, false);
+	}
+	__name(overwritingMethodWrapper, "overwritingMethodWrapper");
+	addLengthGuard(overwritingMethodWrapper, String(name), false);
 	ctx[name] = proxify(overwritingMethodWrapper, name);
 }
 __name(overwriteMethod, "overwriteMethod");
@@ -6907,6 +6917,12 @@ var excludeNames = Object.getOwnPropertyNames(testFn).filter(function(name) {
 var call = Function.prototype.call;
 var apply = Function.prototype.apply;
 var _PluginAddChainableMethodEvent = class _PluginAddChainableMethodEvent extends PluginEvent {
+	/**
+	* @param {string} type
+	* @param {string} name
+	* @param {Function} fn
+	* @param {Function} chainingBehavior
+	*/
 	constructor(type3, name, fn, chainingBehavior) {
 		super(type3, name, fn);
 		this.chainingBehavior = chainingBehavior;
@@ -6915,24 +6931,26 @@ var _PluginAddChainableMethodEvent = class _PluginAddChainableMethodEvent extend
 __name(_PluginAddChainableMethodEvent, "PluginAddChainableMethodEvent");
 var PluginAddChainableMethodEvent = _PluginAddChainableMethodEvent;
 function addChainableMethod(ctx, name, method, chainingBehavior) {
+	const ctxChainable = ctx;
 	if (typeof chainingBehavior !== "function") chainingBehavior = /* @__PURE__ */ __name(function() {}, "chainingBehavior");
 	let chainableBehavior = {
 		method,
 		chainingBehavior
 	};
-	if (!ctx.__methods) ctx.__methods = {};
-	ctx.__methods[name] = chainableBehavior;
+	if (!ctxChainable.__methods) ctxChainable.__methods = {};
+	ctxChainable.__methods[name] = chainableBehavior;
 	Object.defineProperty(ctx, name, {
 		get: /* @__PURE__ */ __name(function chainableMethodGetter() {
 			chainableBehavior.chainingBehavior.call(this);
-			let chainableMethodWrapper = /* @__PURE__ */ __name(function() {
+			function chainableMethodWrapper(...args) {
 				if (!flag(this, "lockSsfi")) flag(this, "ssfi", chainableMethodWrapper);
-				let result = chainableBehavior.method.apply(this, arguments);
+				let result = chainableBehavior.method.apply(this, args);
 				if (result !== void 0) return result;
 				let newAssertion = new Assertion();
 				transferFlags(this, newAssertion);
 				return newAssertion;
-			}, "chainableMethodWrapper");
+			}
+			__name(chainableMethodWrapper, "chainableMethodWrapper");
 			addLengthGuard(chainableMethodWrapper, name, true);
 			if (canSetPrototype) {
 				let prototype = Object.create(this);
@@ -6941,7 +6959,8 @@ function addChainableMethod(ctx, name, method, chainingBehavior) {
 				Object.setPrototypeOf(chainableMethodWrapper, prototype);
 			} else Object.getOwnPropertyNames(ctx).forEach(function(asserterName) {
 				if (excludeNames.indexOf(asserterName) !== -1) return;
-				Object.defineProperty(chainableMethodWrapper, asserterName, Object.getOwnPropertyDescriptor(ctx, asserterName));
+				let pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
+				if (pd) Object.defineProperty(chainableMethodWrapper, asserterName, pd);
 			});
 			transferFlags(this, chainableMethodWrapper);
 			return proxify(chainableMethodWrapper);
@@ -6978,7 +6997,7 @@ __name(compareByInspect, "compareByInspect");
 function getOwnEnumerablePropertySymbols(obj) {
 	if (typeof Object.getOwnPropertySymbols !== "function") return [];
 	return Object.getOwnPropertySymbols(obj).filter(function(sym) {
-		return Object.getOwnPropertyDescriptor(obj, sym).enumerable;
+		return Object.getOwnPropertyDescriptor(obj, sym)?.enumerable;
 	});
 }
 __name(getOwnEnumerablePropertySymbols, "getOwnEnumerablePropertySymbols");
@@ -7001,13 +7020,14 @@ function getOperator(obj, args) {
 	let negate = flag(obj, "negate");
 	let expected = args[3];
 	let msg = negate ? args[2] : args[1];
-	if (operator) return operator;
+	if (operator) return String(operator);
 	if (typeof msg === "function") msg = msg();
 	msg = msg || "";
 	if (!msg) return;
-	if (/\shave\s/.test(msg)) return;
+	const msgString = String(msg);
+	if (/\shave\s/.test(msgString)) return;
 	let isObject = isObjectType(expected);
-	if (/\snot\s/.test(msg)) return isObject ? "notDeepStrictEqual" : "notStrictEqual";
+	if (/\snot\s/.test(msgString)) return isObject ? "notDeepStrictEqual" : "notStrictEqual";
 	return isObject ? "deepStrictEqual" : "strictEqual";
 }
 __name(getOperator, "getOperator");
@@ -7511,18 +7531,19 @@ function assertKeys(keys) {
 	if (!keys.length) throw new AssertionError(flagMsg + "keys required", void 0, ssfi);
 	let len = keys.length, any = flag2(this, "any"), all = flag2(this, "all"), expected = keys, isEql = isDeep ? flag2(this, "eql") : (val1, val2) => val1 === val2;
 	if (!any && !all) all = true;
-	if (any) ok = expected.some(function(expectedKey) {
+	const uniqueExpected = [...new Set(expected)];
+	if (any) ok = uniqueExpected.some(function(expectedKey) {
 		return actual.some(function(actualKey) {
 			return isEql(expectedKey, actualKey);
 		});
 	});
 	if (all) {
-		ok = expected.every(function(expectedKey) {
+		ok = uniqueExpected.every(function(expectedKey) {
 			return actual.some(function(actualKey) {
 				return isEql(expectedKey, actualKey);
 			});
 		});
-		if (!flag2(this, "contains")) ok = ok && keys.length == actual.length;
+		if (!flag2(this, "contains")) ok = ok && uniqueExpected.length == actual.length;
 	}
 	if (len > 1) {
 		keys = keys.map(function(key) {
@@ -7674,28 +7695,32 @@ Assertion.addMethod("members", function(subset, msg) {
 Assertion.addProperty("iterable", function(msg) {
 	if (msg) flag2(this, "message", msg);
 	let obj = flag2(this, "object");
-	this.assert(obj != void 0 && obj[Symbol.iterator], "expected #{this} to be an iterable", "expected #{this} to not be an iterable", obj);
+	this.assert(obj != void 0 && typeof obj[Symbol.iterator] === "function", "expected #{this} to be an iterable", "expected #{this} to not be an iterable", obj);
 });
 function oneOf(list, msg) {
 	if (msg) flag2(this, "message", msg);
 	let expected = flag2(this, "object"), flagMsg = flag2(this, "message"), ssfi = flag2(this, "ssfi"), contains = flag2(this, "contains"), isDeep = flag2(this, "deep"), eql = flag2(this, "eql");
 	new Assertion(list, flagMsg, ssfi, true).to.be.an("array");
 	if (contains) this.assert(list.some(function(possibility) {
-		return expected.indexOf(possibility) > -1;
-	}), "expected #{this} to contain one of #{exp}", "expected #{this} to not contain one of #{exp}", list, expected);
+		return expected.indexOf(possibility) > -1 || isDeep && Array.isArray(expected) && expected.some(function(item) {
+			return eql(item, possibility);
+		});
+	}), "expected #{this} to " + (isDeep ? "deeply " : "") + "contain one of #{exp}", "expected #{this} to not " + (isDeep ? "deeply " : "") + "contain one of #{exp}", list, expected);
 	else if (isDeep) this.assert(list.some(function(possibility) {
 		return eql(expected, possibility);
-	}), "expected #{this} to deeply equal one of #{exp}", "expected #{this} to deeply equal one of #{exp}", list, expected);
+	}), "expected #{this} to deeply equal one of #{exp}", "expected #{this} to not deeply equal one of #{exp}", list, expected);
 	else this.assert(list.indexOf(expected) > -1, "expected #{this} to be one of #{exp}", "expected #{this} to not be one of #{exp}", list, expected);
 }
 __name(oneOf, "oneOf");
 Assertion.addMethod("oneOf", oneOf);
 function assertChanges(subject, prop, msg) {
 	if (msg) flag2(this, "message", msg);
-	let fn = flag2(this, "object"), flagMsg = flag2(this, "message"), ssfi = flag2(this, "ssfi");
+	const fn = flag2(this, "object");
+	const flagMsg = flag2(this, "message");
+	const ssfi = flag2(this, "ssfi");
 	new Assertion(fn, flagMsg, ssfi, true).is.a("function");
 	let initial;
-	if (!prop) {
+	if (prop === null || prop === void 0) {
 		new Assertion(subject, flagMsg, ssfi, true).is.a("function");
 		initial = subject();
 	} else {
@@ -7703,7 +7728,9 @@ function assertChanges(subject, prop, msg) {
 		initial = subject[prop];
 	}
 	fn();
-	let final = prop === void 0 || prop === null ? subject() : subject[prop];
+	let final = prop === void 0 || prop === null ? subject() : 
+	/** @type {Record<PropertyKey, unknown>} */
+subject[prop];
 	let msgObj = prop === void 0 || prop === null ? initial : "." + prop;
 	flag2(this, "deltaMsgObj", msgObj);
 	flag2(this, "initialDeltaValue", initial);
@@ -7717,10 +7744,12 @@ Assertion.addMethod("change", assertChanges);
 Assertion.addMethod("changes", assertChanges);
 function assertIncreases(subject, prop, msg) {
 	if (msg) flag2(this, "message", msg);
-	let fn = flag2(this, "object"), flagMsg = flag2(this, "message"), ssfi = flag2(this, "ssfi");
+	const fn = flag2(this, "object");
+	const flagMsg = flag2(this, "message");
+	const ssfi = flag2(this, "ssfi");
 	new Assertion(fn, flagMsg, ssfi, true).is.a("function");
 	let initial;
-	if (!prop) {
+	if (prop === null || prop === void 0) {
 		new Assertion(subject, flagMsg, ssfi, true).is.a("function");
 		initial = subject();
 	} else {
@@ -7729,7 +7758,9 @@ function assertIncreases(subject, prop, msg) {
 	}
 	new Assertion(initial, flagMsg, ssfi, true).is.a("number");
 	fn();
-	let final = prop === void 0 || prop === null ? subject() : subject[prop];
+	let final = prop === void 0 || prop === null ? subject() : 
+	/** @type {Record<PropertyKey, number>} */
+subject[prop];
 	let msgObj = prop === void 0 || prop === null ? initial : "." + prop;
 	flag2(this, "deltaMsgObj", msgObj);
 	flag2(this, "initialDeltaValue", initial);
@@ -7743,10 +7774,12 @@ Assertion.addMethod("increase", assertIncreases);
 Assertion.addMethod("increases", assertIncreases);
 function assertDecreases(subject, prop, msg) {
 	if (msg) flag2(this, "message", msg);
-	let fn = flag2(this, "object"), flagMsg = flag2(this, "message"), ssfi = flag2(this, "ssfi");
+	const fn = flag2(this, "object");
+	const flagMsg = flag2(this, "message");
+	const ssfi = flag2(this, "ssfi");
 	new Assertion(fn, flagMsg, ssfi, true).is.a("function");
 	let initial;
-	if (!prop) {
+	if (prop === null || prop === void 0) {
 		new Assertion(subject, flagMsg, ssfi, true).is.a("function");
 		initial = subject();
 	} else {
@@ -7755,7 +7788,9 @@ function assertDecreases(subject, prop, msg) {
 	}
 	new Assertion(initial, flagMsg, ssfi, true).is.a("number");
 	fn();
-	let final = prop === void 0 || prop === null ? subject() : subject[prop];
+	let final = prop === void 0 || prop === null ? subject() : 
+	/** @type {Record<PropertyKey, number>} */
+subject[prop];
 	let msgObj = prop === void 0 || prop === null ? initial : "." + prop;
 	flag2(this, "deltaMsgObj", msgObj);
 	flag2(this, "initialDeltaValue", initial);
@@ -7834,12 +7869,12 @@ function expect(val, message) {
 }
 __name(expect, "expect");
 expect.fail = function(actual, expected, message, operator) {
+	let msg = message;
 	if (arguments.length < 2) {
-		message = actual;
+		msg = actual;
 		actual = void 0;
 	}
-	message = message || "expect.fail()";
-	throw new AssertionError(message, {
+	throw new AssertionError(msg || "expect.fail()", {
 		actual,
 		expected,
 		operator
@@ -8291,7 +8326,7 @@ assert$1.oneOf = function(inList, list, msg) {
 	new Assertion(inList, msg, assert$1.oneOf, true).to.be.oneOf(list);
 };
 assert$1.isIterable = function(obj, msg) {
-	if (obj == void 0 || !obj[Symbol.iterator]) {
+	if (obj == void 0 || typeof obj[Symbol.iterator] !== "function") {
 		msg = msg ? `${msg} expected ${inspect2(obj)} to be an iterable` : `expected ${inspect2(obj)} to be an iterable`;
 		throw new AssertionError(msg, void 0, assert$1.isIterable);
 	}
@@ -8485,7 +8520,7 @@ function use(fn) {
 }
 __name(use, "use");
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+expect@4.1.6/node_modules/@vitest/expect/dist/index.js
+//#region ../../node_modules/.pnpm/@vitest+expect@4.1.12/node_modules/@vitest/expect/dist/index.js
 const ChaiStyleAssertions = (chai, utils) => {
 	function defProperty(name, delegateTo) {
 		utils.addProperty(chai.Assertion.prototype, name, function() {
@@ -9947,7 +9982,7 @@ const JestExtend = (chai, utils) => {
 	});
 };
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+utils@4.1.6/node_modules/@vitest/utils/dist/offset.js
+//#region ../../node_modules/.pnpm/@vitest+utils@4.1.12/node_modules/@vitest/utils/dist/offset.js
 const lineSplitRE = /\r?\n/;
 function positionToOffset(source, lineNumber, columnNumber) {
 	const lines = source.split(lineSplitRE);
@@ -9971,10 +10006,10 @@ function offsetToLineNumber(source, offset) {
 	return line + 1;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.6_@types+node@25.9.1_vite@8.0.13_@types+node@25.9.1_yaml@2.8.4_/node_modules/vitest/dist/chunks/_commonjsHelpers.D26ty3Ew.js
+//#region ../../node_modules/.pnpm/vitest@4.1.12_@types+node@25.9.1_vite@8.3.4_@types+node@25.9.1_yaml@2.9.1_/node_modules/vitest/dist/chunks/_commonjsHelpers.D26ty3Ew.js
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.6_@types+node@25.9.1_vite@8.0.13_@types+node@25.9.1_yaml@2.8.4_/node_modules/vitest/dist/chunks/rpc.MzXet3jl.js
+//#region ../../node_modules/.pnpm/vitest@4.1.12_@types+node@25.9.1_vite@8.3.4_@types+node@25.9.1_yaml@2.9.1_/node_modules/vitest/dist/chunks/rpc.MzXet3jl.js
 const RealDate = Date;
 let now = null;
 var MockDate = class MockDate extends RealDate {
@@ -10023,7 +10058,7 @@ function resetDate() {
 }
 const { get } = Reflect;
 //#endregion
-//#region ../../node_modules/.pnpm/@vitest+snapshot@4.1.6/node_modules/@vitest/snapshot/dist/index.js
+//#region ../../node_modules/.pnpm/@vitest+snapshot@4.1.12/node_modules/@vitest/snapshot/dist/index.js
 function getDefaultExportFromCjs(x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -10937,7 +10972,7 @@ function raceWith(promise, other) {
 	}))]);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.6_@types+node@25.9.1_vite@8.0.13_@types+node@25.9.1_yaml@2.8.4_/node_modules/vitest/dist/chunks/test.DNmyFkvJ.js
+//#region ../../node_modules/.pnpm/vitest@4.1.12_@types+node@25.9.1_vite@8.3.4_@types+node@25.9.1_yaml@2.9.1_/node_modules/vitest/dist/chunks/test.DNmyFkvJ.js
 var fakeTimersSrc = {};
 var global$1;
 var hasRequiredGlobal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rrlab/cli",
-  "version": "1.3.4",
+  "version": "1.3.6-git-c9903ab.0",
   "description": "The CLI toolbox to fullstack common scripts in Variable Land",
   "homepage": "https://github.com/withvariablelab/dx/tree/main/run-run/cli#readme",
   "bugs": {
@@ -43,7 +43,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.18.0"
   },
   "dependencies": {
     "@clack/prompts": "0.11.0",

package/src/actions/plugins/add.ts

@@ -10,7 +10,7 @@ import { ConfigAstService } from "#src/services/config-ast.ts";
 import type { ContextValue } from "#src/services/context.ts";
 import { applyFileOp } from "#src/services/file-ops.ts";
 import { logger } from "#src/services/logger.ts";
-import { createClackPrompts } from "#src/services/prompts.ts";
+import { canPrompt, createClackPrompts } from "#src/services/prompts.ts";
 import { ReleaseService } from "#src/services/release.ts";
 import { describeWorkspaceChoice, resolveWorkspaceChoice, toNypmWorkspace } from "#src/services/workspace-target.ts";
 import { type AddOptions, hasInPackageJson, type PluginModule, reportFileOp } from "./shared.ts";
@@ -104,7 +104,7 @@ export async function addPluginAction({ ctx, args, options }: AddPluginActionCon
         flags: {
           force: !!options.force,
           yes: !!options.yes,
-          nonInteractive: !!options.yes,
+          nonInteractive: !!options.yes || !canPrompt(),
         },
         release: new ReleaseService(tag),
       };

package/src/actions/plugins/remove.ts

@@ -1,6 +1,7 @@
 import path from "node:path";
 import * as clack from "@clack/prompts";
 import { detectPackageManager, removeDependency } from "nypm";
+import { ConfirmationRequiredError } from "#src/errors/confirmation-required.ts";
 import { PLUGINS_DIRECTORY, type PluginName } from "#src/lib/plugin/directory.ts";
 import type { UninstallResult } from "#src/lib/plugin/types.ts";
 import { withSpinner } from "#src/render/steps.ts";
@@ -8,7 +9,7 @@ import { ConfigAstService } from "#src/services/config-ast.ts";
 import type { ContextValue } from "#src/services/context.ts";
 import { applyFileOp, describeFileOp } from "#src/services/file-ops.ts";
 import { logger } from "#src/services/logger.ts";
-import { createClackPrompts } from "#src/services/prompts.ts";
+import { canPrompt, createClackPrompts } from "#src/services/prompts.ts";
 import { describeWorkspaceChoice, resolveWorkspaceChoice, toNypmWorkspace } from "#src/services/workspace-target.ts";
 import { hasInPackageJson, type PluginModule, type RemoveOptions, reportFileOp } from "./shared.ts";
 
@@ -41,7 +42,7 @@ export async function removePluginAction({ ctx, args, options }: RemovePluginAct
           logger,
           appPkg: ctx.appPkg,
           prompts: createClackPrompts(),
-          flags: { yes: !!options.yes, nonInteractive: !!options.yes },
+          flags: { yes: !!options.yes, nonInteractive: !!options.yes || !canPrompt() },
         });
       }
     } catch (err) {
@@ -83,6 +84,8 @@ export async function removePluginAction({ ctx, args, options }: RemovePluginAct
   }
 
   if (!options.yes) {
+    // Removing deletes files and dependencies: without a terminal to confirm in, insist on --yes.
+    if (!canPrompt()) throw new ConfirmationRequiredError(`rr plugins remove ${name}`);
     const choice = await clack.confirm({ message: "Proceed?", initialValue: false });
     if (clack.isCancel(choice) || choice !== true) {
       clack.outro("Aborted.");

package/src/errors/confirmation-required.ts

@@ -0,0 +1,7 @@
+import { KnownError } from "./known-error.ts";
+
+export class ConfirmationRequiredError extends KnownError {
+  constructor(command: string) {
+    super(`'${command}' asks for confirmation, and there's no terminal to ask in. Re-run it with --yes.`);
+  }
+}

package/src/program/commands/completion.ts

@@ -13,12 +13,21 @@ export function createCompletionCommand() {
   return createCommand("completion")
     .summary(`print shell completion script`)
     .description(
-      `Prints a shell completion script for rr. Add to your shell rc file:
+      `Prints a shell completion script for rr. Add your shell's line to its rc file:
 
-  bash: eval "$(rr completion bash)"
-  zsh:  eval "$(rr completion zsh)"
-  fish: rr completion fish | source`,
+    # bash — ~/.bashrc
+    command -v rr >/dev/null 2>&1 && eval "$(rr completion bash 2>/dev/null)"
+
+    # zsh — ~/.zshrc
+    command -v rr >/dev/null 2>&1 && eval "$(rr completion zsh 2>/dev/null)"
+
+    # fish — ~/.config/fish/config.fish
+    command -v rr >/dev/null 2>&1; and rr completion fish 2>/dev/null | source`,
     )
+    .configureHelp({
+      // Commander hard-wraps help at the terminal width; a wrapped rc line breaks when pasted.
+      helpWidth: Number.POSITIVE_INFINITY,
+    })
     .addArgument(new Argument("<shell>", `target shell`).choices(SHELLS))
     .addHelpText(
       "afterAll",

package/src/services/config-ast.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { builders, generateCode, loadFile, type ProxifiedModule, parseModule, writeFile } from "magicast";
+import { builders, generateCode, loadFile, type ProxifiedModule, parseModule } from "magicast";
 
 const CONFIG_FILENAMES = ["run-run.config.ts", "run-run.config.mts"] as const;
 
@@ -50,14 +50,7 @@ export class ConfigAstService {
   }
 
   async save(loaded: LoadedConfig): Promise<void> {
-    if (loaded.isNew) {
-      // For a fresh file, write the generated code instead of using
-      // `writeFile` — writeFile expects an existing file as a starting point.
-      const { code } = generateCode(loaded.mod);
-      await fs.writeFile(loaded.filepath, code, "utf8");
-      return;
-    }
-    await writeFile(loaded.mod.$ast, loaded.filepath);
+    await fs.writeFile(loaded.filepath, tidy(generateCode(loaded.mod).code), "utf8");
   }
 
   /**
@@ -84,6 +77,7 @@ export class ConfigAstService {
     // Ensure the import binding exists.
     if (!mod.imports[entry.exportName]) {
       mod.imports.$add({ from: entry.pkgName, imported: "default", local: entry.exportName });
+      this.#placeImport(mod, entry.pkgName);
     }
 
     // Ensure `defineConfig` import + default export shape.
@@ -151,9 +145,30 @@ export class ConfigAstService {
     return opts.plugins;
   }
 
+  /**
+   * Moves the import of `source`, which `imports.$add` puts first, to its
+   * sorted place among the other imports, leaving those in their order: a
+   * sorted file stays sorted, so `rr jsc` passes on what rr wrote.
+   */
+  #placeImport(mod: ProxifiedModule, source: string): void {
+    const program = mod.$ast;
+    if (program.type !== "Program") return;
+    const { body } = program;
+    const from = body.findIndex((node) => node.type === "ImportDeclaration" && node.source.value === source);
+    if (from === -1) return;
+    const [added] = body.splice(from, 1);
+    if (!added) return;
+    const before = body.findIndex(
+      (node) => node.type === "ImportDeclaration" && compareImportSources(node.source.value, source) > 0,
+    );
+    const lastImport = body.reduce((last, node, i) => (node.type === "ImportDeclaration" ? i : last), -1);
+    body.splice(before === -1 ? lastImport + 1 : before, 0, added);
+  }
+
   #ensureDefineConfig(mod: ProxifiedModule): void {
     if (!mod.imports.defineConfig) {
       mod.imports.$add({ from: "@rrlab/cli/config", imported: "defineConfig", local: "defineConfig" });
+      this.#placeImport(mod, "@rrlab/cli/config");
     }
     // biome-ignore lint/suspicious/noExplicitAny: magicast proxies are opaque
     const def = (mod.exports as any).default;
@@ -194,6 +209,32 @@ export class ConfigAstService {
   }
 }
 
+/**
+ * Undoes two recast habits that formatters reject: it keeps the blank line that
+ * followed an import when rr inserts another after it, and it drops the final
+ * newline.
+ */
+function tidy(code: string): string {
+  const joined = code.replace(/^(import\b[^;]*;)\n(?:[ \t]*\n)+(?=import\b)/gm, "$1\n");
+  return joined.endsWith("\n") ? joined : `${joined}\n`;
+}
+
+/**
+ * Biome's organizeImports order: protocol imports (`node:fs`), then packages,
+ * then aliases (`#src/…`, `@/…`, `~/…`), then paths. Within a group, plain
+ * code-unit order, which matches Biome for these names (`ts-plugin` before
+ * `tsdown-plugin`; `localeCompare` flips them).
+ */
+function compareImportSources(a: string, b: string): number {
+  const group = (source: string) => {
+    if (/^[a-z]+:/.test(source)) return 0;
+    if (/^(#|@\/|~)/.test(source)) return 2;
+    if (source.startsWith(".") || source.startsWith("/")) return 3;
+    return 1;
+  };
+  return group(a) - group(b) || (a < b ? -1 : a > b ? 1 : 0);
+}
+
 const MINIMAL_TEMPLATE = `import { defineConfig } from "@rrlab/cli/config";
 
 export default defineConfig({

package/src/services/prompts.ts

@@ -1,6 +1,15 @@
 import * as clack from "@clack/prompts";
 import type { ClackPrompts } from "#src/lib/plugin/types.ts";
 
+/**
+ * Whether a prompt can run: clack reads keys from stdin and draws on stdout,
+ * so both have to be terminals. An agent, a script or CI usually has neither,
+ * and a prompt there waits forever or exits on a closed stdin.
+ */
+export function canPrompt(): boolean {
+  return !!process.stdin.isTTY && !!process.stdout.isTTY;
+}
+
 /**
  * Adapter that exposes the subset of `@clack/prompts` matching the
  * `ClackPrompts` contract from `@rrlab/cli/plugin`. The contract intentionally