@flowscripter/dynamic-cli-framework 9.0.2 → 9.0.4

package/dist/src/service/upgrade/method/homebrew.js

@@ -0,0 +1,132 @@
+import process from "node:process";
+import { existsSync, realpathSync } from "node:fs";
+import { basename, join } from "node:path";
+import semver, {} from "semver";
+import { describeSpawnFailure, spawnQuoted } from "./shared.js";
+// `brew list --versions <formula>` prints the formula name followed by one or more installed
+// versions, each optionally prefixed with "v" and optionally suffixed with a "_N" revision.
+export function parseBrewInstalledVersions(output, formula) {
+    const tokens = output.trim().split(/\s+/).filter(Boolean);
+    if (tokens[0] === formula) {
+        tokens.shift();
+    }
+    const versions = [];
+    for (const token of tokens) {
+        const version = semver.coerce(token.replace(/^v/i, "").replace(/_\d+$/, ""));
+        if (version) {
+            versions.push(version);
+        }
+    }
+    return versions;
+}
+function resolveRealExecutable() {
+    try {
+        return realpathSync(process.execPath);
+    }
+    catch {
+        // process.execPath may not resolve on disk (e.g. a fabricated path in tests) - fall back to
+        // the unresolved path rather than treating that as "not installed".
+        return process.execPath;
+    }
+}
+// Homebrew relinks a formula's installed binary from its Cellar directory into a `bin/` symlink,
+// so resolving the running executable's real path confirms a homebrew install without spawning
+// `brew`, which has a slow cold start - avoiding it keeps the background upgrade-check
+// StartupTask (see UpgradeServiceProvider) fast even though it runs to completion.
+export function isRunningFromHomebrewCellar(formula) {
+    return resolveRealExecutable().includes(`/Cellar/${formula}/`);
+}
+// The running executable lives in a version-specific Cellar directory, e.g.
+// "<prefix>/Cellar/<formula>/<version>/bin/<exe>", while "<prefix>/opt/<formula>" links to the
+// installed version, so the upgraded executable is "<prefix>/opt/<formula>/bin/<exe>".
+export function resolveHomebrewOptExecutable(location) {
+    if (!location) {
+        return undefined;
+    }
+    const { formula } = location;
+    const realExecutable = resolveRealExecutable();
+    const cellarIndex = realExecutable.indexOf(`/Cellar/${formula}/`);
+    if (cellarIndex === -1) {
+        return undefined;
+    }
+    const prefix = realExecutable.slice(0, cellarIndex);
+    const executable = join(prefix, "opt", formula, "bin", basename(realExecutable));
+    return existsSync(executable) ? executable : undefined;
+}
+export async function isHomebrewInstalled(spawnService, location) {
+    if (!spawnService || !location) {
+        return false;
+    }
+    const result = await spawnService.spawn(["brew", "list", "--versions", location.formula], {
+        mode: "ignore",
+        longRunning: false,
+    });
+    return result.ok;
+}
+export async function getLatestHomebrewVersion(fetchService, location) {
+    if (!location) {
+        return { ok: false, error: new Error("No homebrew location configured") };
+    }
+    if (!fetchService) {
+        return { ok: false, error: new Error("FetchService is not available") };
+    }
+    const { tap, formula } = location;
+    const [tapOwner, tapName] = tap.split("/");
+    if (!tapOwner || !tapName) {
+        return { ok: false, error: new Error(`Invalid homebrew tap '${tap}'`) };
+    }
+    try {
+        const response = await fetchService.fetch(`https://raw.githubusercontent.com/${tapOwner}/homebrew-${tapName}/main/${formula}.rb`);
+        if (!response.ok) {
+            return {
+                ok: false,
+                error: new Error(`Failed to fetch homebrew formula for ${tap}/${formula}: HTTP ${response.status}`),
+            };
+        }
+        const text = await response.text();
+        const version = /version\s+"v?([^"]+)"/.exec(text)?.[1];
+        if (!version) {
+            return {
+                ok: false,
+                error: new Error(`Could not parse version from homebrew formula ${tap}/${formula}`),
+            };
+        }
+        return { ok: true, version };
+    }
+    catch (error) {
+        return {
+            ok: false,
+            error: new Error(`Failed to fetch homebrew formula for ${tap}/${formula}: ${error}`),
+        };
+    }
+}
+// The latest version is read from the tap's formula on GitHub, but `brew upgrade` only sees the
+// local tap clone, which is stale until `brew update` runs. A stale tap makes `brew upgrade`
+// exit 0 with "already installed", so update first and then confirm the installed version.
+export async function upgradeViaHomebrew(spawnService, printerService, location, expectedVersion) {
+    const { tap, formula } = location;
+    const updateResult = await spawnQuoted(spawnService, printerService, ["brew", "update"]);
+    if (!updateResult.ok) {
+        throw new Error(`brew update failed: ${describeSpawnFailure(updateResult)}`);
+    }
+    const result = await spawnQuoted(spawnService, printerService, [
+        "brew",
+        "upgrade",
+        `${tap}/${formula}`,
+    ]);
+    if (!result.ok) {
+        throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
+    }
+    const lines = [];
+    const listResult = await spawnService.spawn(["brew", "list", "--versions", formula], {
+        mode: "wrapped",
+        longRunning: false,
+        onOutput: (line) => lines.push(line),
+    });
+    const installed = lines.join(" ").trim();
+    const expected = semver.coerce(expectedVersion);
+    const isExpectedInstalled = parseBrewInstalledVersions(installed, formula).some((version) => expected !== null && semver.eq(version, expected));
+    if (!listResult.ok || !isExpectedInstalled) {
+        throw new Error(`brew upgrade completed but version ${expectedVersion} is not installed (installed: ${installed || "unknown"})`);
+    }
+}

package/dist/src/service/upgrade/method/linuxScript.d.ts

@@ -0,0 +1,5 @@
+import type { PrinterService, SpawnService } from "@flowscripter/dynamic-cli-framework-api";
+import type { LinuxScriptLocation } from "../UpgradeLocationsConfig.ts";
+export declare function isLinuxScriptInstall(): boolean;
+export declare function upgradeViaLinuxScript(spawnService: SpawnService, printerService: PrinterService | undefined, location: LinuxScriptLocation): Promise<void>;
+//# sourceMappingURL=linuxScript.d.ts.map

package/dist/src/service/upgrade/method/linuxScript.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"linuxScript.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/method/linuxScript.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAED,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,IAAI,CAAC,CASf"}

package/dist/src/service/upgrade/method/linuxScript.js

@@ -0,0 +1,15 @@
+import process from "node:process";
+import { describeSpawnFailure, spawnQuoted } from "./shared.js";
+export function isLinuxScriptInstall() {
+    return process.execPath.startsWith("/usr/local/bin/");
+}
+export async function upgradeViaLinuxScript(spawnService, printerService, location) {
+    const result = await spawnQuoted(spawnService, printerService, [
+        "sh",
+        "-c",
+        `curl -fsSL ${location.scriptUrl} | sh`,
+    ]);
+    if (!result.ok) {
+        throw new Error(`Install script failed: ${describeSpawnFailure(result)}`);
+    }
+}

package/dist/src/service/upgrade/method/shared.d.ts

@@ -0,0 +1,13 @@
+import type { PrinterService, SpawnResult, SpawnService } from "@flowscripter/dynamic-cli-framework-api";
+export type VersionLookupResult = {
+    readonly ok: true;
+    readonly version: string;
+} | {
+    readonly ok: false;
+    readonly error: Error;
+};
+export declare function describeSpawnFailure(result: Extract<SpawnResult, {
+    ok: false;
+}>): string;
+export declare function spawnQuoted(spawnService: SpawnService, printerService: PrinterService | undefined, command: ReadonlyArray<string>): Promise<SpawnResult>;
+//# sourceMappingURL=shared.d.ts.map

package/dist/src/service/upgrade/method/shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/method/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACb,MAAM,yCAAyC,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAC3B;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAElD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC,GAAG,MAAM,CAIxF;AAKD,wBAAsB,WAAW,CAC/B,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAC7B,OAAO,CAAC,WAAW,CAAC,CA2BtB"}

package/dist/src/service/upgrade/method/shared.js

@@ -0,0 +1,33 @@
+export function describeSpawnFailure(result) {
+    return "timedOut" in result
+        ? "timed out"
+        : (result.error?.message ?? `exit code ${result.exitCode}`);
+}
+// Mirrors SpawnInterfaceAdapter's plugin:add/plugin:remove pattern: wrap a spawned command's
+// output in a quoted, marked block that's cleared on success (so a clean install stays quiet)
+// but left on screen on failure (so the diagnostic output remains visible).
+export async function spawnQuoted(spawnService, printerService, command) {
+    if (!printerService) {
+        return spawnService.spawn(command, { mode: "ignore" });
+    }
+    printerService.startQuote();
+    printerService.startMark();
+    // onOutput is synchronous and may be called concurrently for stdout/stderr lines, but
+    // printerService.info() is async and must not be invoked concurrently with itself - queue
+    // writes so they're applied one at a time, in call order.
+    let writeQueue = Promise.resolve();
+    const onOutput = (line) => {
+        writeQueue = writeQueue.then(() => printerService.info(`${line}\n`));
+    };
+    const result = await spawnService.spawn(command, { mode: "wrapped", onOutput });
+    await writeQueue;
+    printerService.endQuote();
+    printerService.endMark();
+    if (result.ok) {
+        await printerService.clearMarked();
+    }
+    else {
+        printerService.discardMark();
+    }
+    return result;
+}

package/dist/src/service/upgrade/method/winget.d.ts

@@ -0,0 +1,7 @@
+import type { PrinterService, SpawnService } from "@flowscripter/dynamic-cli-framework-api";
+import type { WingetLocation } from "../UpgradeLocationsConfig.ts";
+import { type VersionLookupResult } from "./shared.ts";
+export declare function isWingetInstalled(spawnService: SpawnService | undefined, location: WingetLocation | undefined): Promise<boolean>;
+export declare function getLatestWingetVersion(spawnService: SpawnService | undefined, location: WingetLocation | undefined): Promise<VersionLookupResult>;
+export declare function upgradeViaWinget(spawnService: SpawnService, printerService: PrinterService | undefined, location: WingetLocation): Promise<void>;
+//# sourceMappingURL=winget.d.ts.map

package/dist/src/service/upgrade/method/winget.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"winget.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/method/winget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAqC,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE1F,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,QAAQ,EAAE,cAAc,GAAG,SAAS,GACnC,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,wBAAsB,sBAAsB,CAC1C,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,QAAQ,EAAE,cAAc,GAAG,SAAS,GACnC,OAAO,CAAC,mBAAmB,CAAC,CAuB9B;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC,CAaf"}

package/dist/src/service/upgrade/method/winget.js

@@ -0,0 +1,49 @@
+import { describeSpawnFailure, spawnQuoted } from "./shared.js";
+export async function isWingetInstalled(spawnService, location) {
+    if (!spawnService || !location) {
+        return false;
+    }
+    const result = await spawnService.spawn(["winget", "list", "--id", location.packageId], {
+        mode: "ignore",
+        longRunning: false,
+    });
+    return result.ok;
+}
+export async function getLatestWingetVersion(spawnService, location) {
+    if (!location) {
+        return { ok: false, error: new Error("No winget location configured") };
+    }
+    if (!spawnService) {
+        return { ok: false, error: new Error("SpawnService is not available") };
+    }
+    const lines = [];
+    const result = await spawnService.spawn(["winget", "show", "--id", location.packageId], {
+        mode: "wrapped",
+        longRunning: false,
+        onOutput: (line) => lines.push(line),
+    });
+    if (!result.ok) {
+        return { ok: false, error: new Error(`winget show failed: ${describeSpawnFailure(result)}`) };
+    }
+    for (const line of lines) {
+        const match = /Version:\s*(\S+)/.exec(line);
+        if (match?.[1]) {
+            return { ok: true, version: match[1] };
+        }
+    }
+    return { ok: false, error: new Error("Could not parse version from winget output") };
+}
+export async function upgradeViaWinget(spawnService, printerService, location) {
+    const result = await spawnQuoted(spawnService, printerService, [
+        "winget",
+        "upgrade",
+        "--id",
+        location.packageId,
+        "--silent",
+        "--accept-package-agreements",
+        "--accept-source-agreements",
+    ]);
+    if (!result.ok) {
+        throw new Error(`winget upgrade failed: ${describeSpawnFailure(result)}`);
+    }
+}

package/dist/src/util/helpHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpHelper.d.ts","sourceRoot":"","sources":["../../../src/util/helpHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAG7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAIvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAM5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAMrF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxC;AAsDD,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AA2BD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,aAAa,EAAE,aAAa,GAC3B,SAAS,CA6DX;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CA+C3E;AAkLD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,WAAW,CAAC,CAoBpB;AACD,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,KAAK,CAAC,WAAW,CAAC,CAgCpB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,aAAa,CAAC,qBAAqB,CAAC,EAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,EAC5C,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,CA8IR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,EAAE,CAkBV"}
+{"version":3,"file":"helpHelper.d.ts","sourceRoot":"","sources":["../../../src/util/helpHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAG7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAIvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAM5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AA6BrF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxC;AAsDD,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AA2BD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,aAAa,EAAE,aAAa,GAC3B,SAAS,CA6DX;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CA+C3E;AAkLD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,WAAW,CAAC,CAoBpB;AACD,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,KAAK,CAAC,WAAW,CAAC,CAgCpB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,aAAa,CAAC,qBAAqB,CAAC,EAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,EAC5C,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,CA8IR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,EAAE,CAkBV"}

package/dist/src/util/helpHelper.js

@@ -4,6 +4,27 @@ import { getGlobalCommandArgumentConfigurationKey, getSubCommandArgumentConfigur
 const SYNTAX_INDENT_WIDTH = 2;
 const MINIMUM_SYNTAX_COLUMN_WIDTH = 15;
 const HELP_SYNTAX_INDENT = " ".repeat(SYNTAX_INDENT_WIDTH);
+const USER_INPUT_START = "\uE000";
+const USER_INPUT_END = "\uE001";
+const USER_INPUT_PATTERN = new RegExp(`${USER_INPUT_START}(.*?)${USER_INPUT_END}`, "gs");
+function userInput(value) {
+    return `${USER_INPUT_START}${value}${USER_INPUT_END}`;
+}
+function renderDescription(printerService, description) {
+    let rendered = "";
+    let last = 0;
+    for (const match of description.matchAll(USER_INPUT_PATTERN)) {
+        if (match.index > last) {
+            rendered += printerService.secondary(description.slice(last, match.index));
+        }
+        rendered += printerService.primary(match[1]);
+        last = match.index + match[0].length;
+    }
+    if (last < description.length) {
+        rendered += printerService.secondary(description.slice(last));
+    }
+    return rendered;
+}
 function flattenHelpEntry(printerService, helpEntry, indentText, isRoot, isLastSibling, rows) {
     let syntax = "";
     if (helpEntry.syntax) {
@@ -22,7 +43,7 @@ function flattenHelpEntry(printerService, helpEntry, indentText, isRoot, isLastS
         }
     }
     const description = helpEntry.description
-        ? printerService.secondary(helpEntry.description)
+        ? renderDescription(printerService, helpEntry.description)
         : undefined;
     rows.push({ syntax, description });
     if (helpEntry.helpSubEntries !== undefined) {
@@ -101,7 +122,7 @@ export function getGlobalArgumentHelpEntry(cliConfig, includeEnvVars, globalComm
     const syntax = getGlobalCommandArgumentForm(argument);
     const notesItems = [];
     if (argument.allowableValues !== undefined && argument.allowableValues.length > 0) {
-        notesItems.push(`valid values: ${argument.allowableValues.join("|")}`);
+        notesItems.push(`valid values: ${userInput(argument.allowableValues.join("|"))}`);
     }
     else {
         switch (argument.type) {
@@ -127,7 +148,7 @@ export function getGlobalArgumentHelpEntry(cliConfig, includeEnvVars, globalComm
         }
     }
     if (argument.defaultValue !== undefined) {
-        notesItems.push(`default: ${argument.defaultValue}`);
+        notesItems.push(`default: ${userInput(String(argument.defaultValue))}`);
     }
     if (includeEnvVars) {
         const configurationKey = getGlobalCommandArgumentConfigurationKey(cliConfig, globalCommand, argument);
@@ -214,7 +235,7 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
     }
     else {
         if (option.allowableValues !== undefined && option.allowableValues.length > 0) {
-            notesItems.push(`valid values: ${option.allowableValues.join("|")}`);
+            notesItems.push(`valid values: ${userInput(option.allowableValues.join("|"))}`);
         }
         else {
             switch (option.type) {
@@ -244,9 +265,9 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
         notesItems.push(range);
     }
     if (option.defaultValue !== undefined) {
-        notesItems.push(`default: ${Array.isArray(option.defaultValue)
+        notesItems.push(`default: ${userInput(Array.isArray(option.defaultValue)
             ? `${option.defaultValue.join(", ")}`
-            : `${option.defaultValue}`}`);
+            : `${option.defaultValue}`)}`);
     }
     if (option.isOptional) {
         notesItems.push("optional");
@@ -282,7 +303,7 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
 function getPositionalHelpEntry(cliConfig, includeEnvVars, command, positional) {
     const notesItems = [];
     if (positional.allowableValues !== undefined && positional.allowableValues.length > 0) {
-        notesItems.push(`valid values: ${positional.allowableValues.join("|")}`);
+        notesItems.push(`valid values: ${userInput(positional.allowableValues.join("|"))}`);
     }
     else {
         switch (positional.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "9.0.2",
+  "version": "9.0.4",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",