toolcraft 0.0.26 → 0.0.33

package/dist/cli.compile-check.js

@@ -13,8 +13,14 @@ const ignoredRoot = defineGroup({
     children: [ignoredCommand],
 });
 const ignoredOptions = {
-    approvals: false,
+    approvals: true,
     casing: "kebab",
+    controls: {
+        debug: true,
+        output: true,
+        verbose: true,
+        yes: true,
+    },
     humanInLoop: {},
     version: "1.0.0",
 };

package/dist/cli.d.ts

@@ -1,11 +1,20 @@
+import { configureTheme } from "toolcraft-design";
 import type { Group } from "./index.js";
 import { type ErrorReportsOption } from "./error-report.js";
 import type { HumanInLoopRuntimeOptions } from "./human-in-loop/index.js";
+export { configureTheme };
 type Casing = "kebab" | "snake";
+export interface CLIControls {
+    debug?: boolean;
+    output?: boolean;
+    verbose?: boolean;
+    yes?: boolean;
+}
 export interface RunCLIOptions<TServices extends object = Record<string, unknown>> {
     apiVersion?: string;
     approvals?: boolean;
     casing?: Casing;
+    controls?: CLIControls;
     humanInLoop?: HumanInLoopRuntimeOptions;
     projectRoot?: string;
     rootDisplayName?: string;
@@ -16,4 +25,3 @@ export interface RunCLIOptions<TServices extends object = Record<string, unknown
     errorReports?: ErrorReportsOption;
 }
 export declare function runCLI<TServices extends object = Record<string, unknown>>(roots: Group<TServices> | Group<TServices>[], options?: RunCLIOptions<TServices>): Promise<void>;
-export {};

package/dist/cli.js

@@ -1,8 +1,9 @@
 import { access, lstat, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { Command as CommanderCommand, CommanderError, InvalidArgumentError, Option } from "commander";
-import { cancel, confirm, createLogger, formatCommandList, formatOptionList, getTheme, helpFormatterPlain, isCancel, note, promptText, renderTable, resetOutputFormatCache, select, text } from "@poe-code/design-system";
+import { cancel, configureTheme, confirm, createLogger, formatCommandList, formatOptionList, getTheme, helpFormatterPlain, isCancel, note, promptText, renderTable, resetOutputFormatCache, select, text } from "toolcraft-design";
 import { ApprovalDeclinedError, UserError, assertCommandRequirements, getCommandSourcePath, resolveCommandSecrets } from "./index.js";
+import { hasOwnErrorCode } from "./error-codes.js";
 import { mergeApprovalsGroup } from "./human-in-loop/approvals-commands.js";
 import { writeErrorReport } from "./error-report.js";
 import { invokeWithHumanInLoop } from "./human-in-loop/index.js";
@@ -15,6 +16,8 @@ import { renderSourceSnippet } from "./source-snippet.js";
 import { enableSourceMaps, formatDebugStack } from "./stack-trim.js";
 import { suggest } from "./suggest.js";
 import { throwValidationErrors } from "./validation-errors.js";
+configureTheme({ brand: "blue", label: "Toolcraft" });
+export { configureTheme };
 const RESERVED_SERVICE_NAMES = new Set([
     "params",
     "secrets",
@@ -470,7 +473,7 @@ function getJsonParseErrorLocation(error, source) {
     return null;
 }
 function getJsonParseCauseLocation(error) {
-    if (typeof error !== "object" || error === null || !("cause" in error)) {
+    if (typeof error !== "object" || error === null || !hasOwnProperty(error, "cause")) {
         return null;
     }
     const cause = error.cause;
@@ -482,13 +485,11 @@ function getJsonParseCauseLocation(error) {
     return { line, column };
 }
 function getNumericProperty(value, key) {
-    if (typeof value !== "object" || value === null || !(key in value)) {
+    if (typeof value !== "object" || value === null || !hasOwnProperty(value, key)) {
         return null;
     }
     const propertyValue = value[key];
-    return typeof propertyValue === "number" && Number.isFinite(propertyValue)
-        ? propertyValue
-        : null;
+    return typeof propertyValue === "number" && Number.isFinite(propertyValue) ? propertyValue : null;
 }
 function getJsonParseMessagePosition(message) {
     const marker = " at position ";
@@ -608,11 +609,31 @@ function createOption(field, globalLongOptionFlags) {
     const option = createCommanderOption(`${flags} <value>`, field.description, field);
     return [option];
 }
-const ALWAYS_GLOBAL_LONG_OPTION_FLAGS = ["--yes", "--output", "--debug", "--verbose"];
-function getGlobalLongOptionFlags(presetsEnabled, versionEnabled = false) {
-    const flags = presetsEnabled
-        ? ["--preset", ...ALWAYS_GLOBAL_LONG_OPTION_FLAGS]
-        : [...ALWAYS_GLOBAL_LONG_OPTION_FLAGS];
+function resolveCLIControls(controls) {
+    return {
+        debug: controls?.debug === true,
+        output: controls?.output === true,
+        verbose: controls?.verbose === true,
+        yes: controls?.yes === true
+    };
+}
+function getGlobalLongOptionFlags(presetsEnabled, versionEnabled, controls) {
+    const flags = [];
+    if (presetsEnabled) {
+        flags.push("--preset");
+    }
+    if (controls.yes) {
+        flags.push("--yes");
+    }
+    if (controls.output) {
+        flags.push("--output");
+    }
+    if (controls.debug) {
+        flags.push("--debug");
+    }
+    if (controls.verbose) {
+        flags.push("--verbose");
+    }
     if (versionEnabled) {
         flags.push("--version");
     }
@@ -971,11 +992,16 @@ function formatGlobalOptionsLine(ctx) {
     if (ctx.presetsEnabled) {
         flags.push("--preset <path>");
     }
-    flags.push("--yes", "--output <format>");
+    if (ctx.controls.yes) {
+        flags.push("--yes");
+    }
+    if (ctx.controls.output) {
+        flags.push("--output <format>");
+    }
     if (ctx.showVersion) {
         flags.push("--version");
     }
-    return `${text.section("Options:")} ${flags.join("  ")}`;
+    return flags.length > 0 ? `${text.section("Options:")} ${flags.join("  ")}` : "";
 }
 function collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlags) {
     const seen = new Map();
@@ -1011,12 +1037,12 @@ function renderHelpSections(sections) {
     return sections.filter((section) => section.length > 0).join("\n\n");
 }
 function formatHelpCommandList(rows) {
-    return process.stdout.isTTY === false
+    return process.stdout.isTTY !== true
         ? helpFormatterPlain.formatCommandList(rows)
         : formatCommandList(rows);
 }
 function formatHelpOptionList(rows) {
-    return process.stdout.isTTY === false
+    return process.stdout.isTTY !== true
         ? helpFormatterPlain.formatOptionList(rows)
         : formatOptionList(rows);
 }
@@ -1029,7 +1055,7 @@ function buildUsageLine(breadcrumb, rootUsageName, suffix) {
 }
 function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUsageName, isRoot) {
     const sections = [];
-    const globalLongOptionFlags = getGlobalLongOptionFlags(globalOptions.presetsEnabled, globalOptions.showVersion);
+    const globalLongOptionFlags = getGlobalLongOptionFlags(globalOptions.presetsEnabled, globalOptions.showVersion, globalOptions.controls);
     const commandRows = formatCommandRows(group, scope, casing, globalLongOptionFlags);
     if (commandRows.length > 0) {
         sections.push(`${text.sectionHeader("Commands")}\n${formatHelpCommandList(commandRows)}`);
@@ -1055,7 +1081,7 @@ function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUs
 }
 function renderLeafHelp(command, breadcrumb, casing, globalOptions, rootUsageName) {
     const sections = [];
-    const globalLongOptionFlags = getGlobalLongOptionFlags(globalOptions.presetsEnabled, globalOptions.showVersion);
+    const globalLongOptionFlags = getGlobalLongOptionFlags(globalOptions.presetsEnabled, globalOptions.showVersion, globalOptions.controls);
     const collected = collectFields(command.params, casing, globalLongOptionFlags);
     const fields = assignPositionals(collected.fields, command.positional);
     const optionRows = fields
@@ -1111,20 +1137,23 @@ async function renderGeneratedHelp(root, argv, options) {
     const output = resolveHelpOutput(argv);
     const casing = options.casing ?? "kebab";
     const rootUsageName = options.rootUsageName ?? inferProgramName(argv);
+    const controls = resolveCLIControls(options.controls);
     await withOutputFormat(output, async () => {
         const rendered = target.node.kind === "group"
             ? renderGroupHelp(target.node, target.breadcrumb, "cli", casing, {
+                controls,
                 showVersion: options.version !== undefined,
                 presetsEnabled: options.presets === true
             }, rootUsageName, target.node === root)
             : renderLeafHelp(target.node, target.breadcrumb, casing, {
+                controls,
                 showVersion: options.version !== undefined,
                 presetsEnabled: options.presets === true
             }, rootUsageName);
         process.stdout.write(rendered);
     });
 }
-function createNodeCommand(node, casing, globalLongOptionFlags, execute, presetsEnabled, pathSegments = []) {
+function createNodeCommand(node, casing, globalLongOptionFlags, execute, presetsEnabled, controls, pathSegments = []) {
     const nextPathSegments = [...pathSegments, node.name];
     if (node.kind === "command") {
         if (!node.scope.includes("cli")) {
@@ -1139,7 +1168,7 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
         }
         node.aliases.forEach((alias) => command.alias(alias));
         command.addHelpCommand(false);
-        addGlobalOptions(command, presetsEnabled);
+        addGlobalOptions(command, presetsEnabled, controls);
         command.allowExcessArguments(true);
         if (collected.dynamicFields.length > 0) {
             command.allowUnknownOption(true);
@@ -1175,7 +1204,7 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
         return null;
     }
     const visibleChildren = node.children
-        .map((child) => createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled, nextPathSegments))
+        .map((child) => createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled, controls, nextPathSegments))
         .filter((child) => child !== null);
     const group = new CommanderCommand(node.name);
     if (node.description !== undefined) {
@@ -1183,37 +1212,60 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
     }
     node.aliases.forEach((alias) => group.alias(alias));
     group.addHelpCommand(false);
-    addGlobalOptions(group, presetsEnabled);
+    addGlobalOptions(group, presetsEnabled, controls);
+    const childNames = new Set(visibleChildren.map((child) => child.name()));
     for (const child of visibleChildren) {
         const isDefaultChild = node.default !== undefined &&
             node.default.scope.includes("cli") &&
             (child.name() === node.default.name || child.aliases().includes(node.default.name));
-        group.addCommand(child, isDefaultChild ? { isDefault: true } : undefined);
+        addCommanderChild(group, child, isDefaultChild, childNames);
     }
     return group;
 }
-function addGlobalOptions(command, presetsEnabled) {
+function addCommanderChild(parent, child, isDefault, siblingNames) {
+    if (isDefault && child.name().length === 0) {
+        let internalName = "__toolcraft_default__";
+        let suffix = 2;
+        while (siblingNames.has(internalName)) {
+            internalName = `__toolcraft_default_${suffix}`;
+            suffix += 1;
+        }
+        child.name(internalName);
+        parent.addCommand(child, { hidden: true, isDefault: true });
+        return;
+    }
+    parent.addCommand(child, isDefault ? { isDefault: true } : undefined);
+}
+function addGlobalOptions(command, presetsEnabled, controls) {
     const options = [];
     if (presetsEnabled) {
         options.push(new Option("--preset <path>", "Load parameter defaults from a JSON file."));
     }
-    options.push(new Option("--yes", "Accept defaults and skip prompts."));
-    options.push(new Option("--output <format>", "Output format.").argParser((value) => {
-        if (value === "rich" || value === "md" || value === "json") {
-            return value;
-        }
-        if (value === "markdown") {
-            return "md";
-        }
-        throw new InvalidArgumentError(formatInvalidEnumMessage("--output", value, ["rich", "md", "markdown", "json"], {
-            candidates: ["rich", "markdown", "json"],
-            threshold: 3
+    if (controls.yes) {
+        options.push(new Option("--yes", "Accept defaults and skip prompts."));
+    }
+    if (controls.output) {
+        options.push(new Option("--output <format>", "Output format.").argParser((value) => {
+            if (value === "rich" || value === "md" || value === "json") {
+                return value;
+            }
+            if (value === "markdown") {
+                return "md";
+            }
+            throw new InvalidArgumentError(formatInvalidEnumMessage("--output", value, ["rich", "md", "markdown", "json"], {
+                candidates: ["rich", "markdown", "json"],
+                threshold: 3
+            }));
         }));
-    }));
-    options.push(new Option("--debug [mode]", "Print stack traces for unexpected errors.")
-        .preset("trim")
-        .argParser(parseDebugStackMode));
-    options.push(new Option("--verbose", "Print detailed runtime diagnostics."));
+    }
+    if (controls.debug) {
+        options.push(new Option("--debug [mode]", "Print stack traces for unexpected errors.")
+            .preset("trim")
+            .argParser(parseDebugStackMode));
+    }
+    if (controls.verbose) {
+        options.push(new Option("--verbose", "Print detailed runtime diagnostics."));
+    }
     for (const option of options) {
         option.hideHelp(true);
         command.addOption(option);
@@ -1270,13 +1322,20 @@ function formatResolvedValue(value) {
 function fieldPromptLabel(field) {
     return field.positionalIndex === undefined ? field.optionFlag : `<${field.displayPath}>`;
 }
+function enumOptionLabel(schema, value) {
+    const key = String(value);
+    if (schema.labels === undefined || !Object.prototype.hasOwnProperty.call(schema.labels, key)) {
+        return key;
+    }
+    return schema.labels[key] ?? key;
+}
 async function promptForField(field) {
     const schema = field.schema;
     if (schema.kind === "enum") {
         const options = schema.loadOptions
             ? await schema.loadOptions()
             : schema.values.map((value) => ({
-                label: schema.labels?.[String(value)] ?? String(value),
+                label: enumOptionLabel(schema, value),
                 value
             }));
         const selected = await select({
@@ -1365,8 +1424,8 @@ async function withOutputFormat(output, fn) {
 function createFs() {
     return {
         readFile: async (path, encoding = "utf8") => readFile(path, { encoding }),
-        writeFile: async (path, contents) => {
-            await writeFile(path, contents);
+        writeFile: async (path, contents, options) => {
+            await writeFile(path, contents, options);
         },
         exists: async (path) => {
             try {
@@ -1468,7 +1527,7 @@ async function loadPresetValues(fields, presetPath) {
         });
     }
     catch (error) {
-        if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") {
+        if (hasOwnErrorCode(error, "ENOENT")) {
             throw new UserError(`Preset file "${presetPath}" was not found.`);
         }
         const message = error instanceof Error && error.message.length > 0 ? error.message : "Unknown read error.";
@@ -2492,10 +2551,10 @@ function isHttpErrorLike(error) {
         typeof response.status === "number" &&
         typeof response.statusText === "string" &&
         isStringRecord(response.headers) &&
-        "body" in response);
+        hasOwnProperty(response, "body"));
 }
 function hasTypedOptionalField(value, field, type) {
-    return !(field in value) || typeof value[field] === type;
+    return !hasOwnProperty(value, field) || typeof value[field] === type;
 }
 function isNonEmptyString(value) {
     return typeof value === "string" && value.trim().length > 0;
@@ -2519,7 +2578,7 @@ function isProblemDetailsLike(body) {
     if (!hasTypedOptionalField(body, "instance", "string")) {
         return false;
     }
-    return isNonEmptyString(body.title) || isNonEmptyString(body.detail);
+    return hasOwnNonEmptyString(body, "title") || hasOwnNonEmptyString(body, "detail");
 }
 function isGraphQLErrorEnvelopeLike(body) {
     if (!isPlainObject(body) || !Array.isArray(body.errors) || body.errors.length === 0) {
@@ -2529,45 +2588,51 @@ function isGraphQLErrorEnvelopeLike(body) {
         if (!isPlainObject(error) || typeof error.message !== "string") {
             return false;
         }
-        if ("path" in error) {
+        if (hasOwnProperty(error, "path")) {
             const pathValue = error.path;
             if (!Array.isArray(pathValue) ||
                 !pathValue.every((entry) => typeof entry === "string" || typeof entry === "number")) {
                 return false;
             }
         }
-        if ("extensions" in error) {
+        if (hasOwnProperty(error, "extensions")) {
             if (!isPlainObject(error.extensions)) {
                 return false;
             }
-            if ("code" in error.extensions && typeof error.extensions.code !== "string") {
+            if (hasOwnProperty(error.extensions, "code") && typeof error.extensions.code !== "string") {
                 return false;
             }
         }
         return true;
     });
 }
+function hasOwnProperty(value, name) {
+    return Object.prototype.hasOwnProperty.call(value, name);
+}
+function hasOwnNonEmptyString(value, name) {
+    return hasOwnProperty(value, name) && isNonEmptyString(value[name]);
+}
 function styleHttpErrorLine(value, style) {
-    return process.stdout.isTTY === false ? value : style(value);
+    return process.stdout.isTTY !== true ? value : style(value);
 }
 function formatHttpErrorStatus(value) {
     return styleHttpErrorLine(value, text.error);
 }
 function formatProblemDetailsBody(body) {
     const lines = [];
-    if (isNonEmptyString(body.title)) {
+    if (hasOwnNonEmptyString(body, "title")) {
         lines.push(`Problem: ${body.title}`);
     }
-    if (isNonEmptyString(body.detail)) {
+    if (hasOwnNonEmptyString(body, "detail")) {
         lines.push(`Detail:  ${body.detail}`);
     }
-    if (body.type !== undefined) {
+    if (hasOwnProperty(body, "type") && body.type !== undefined) {
         lines.push(`Type:    ${body.type}`);
     }
-    if (body.instance !== undefined) {
+    if (hasOwnProperty(body, "instance") && body.instance !== undefined) {
         lines.push(`Instance: ${body.instance}`);
     }
-    if (body.status !== undefined) {
+    if (hasOwnProperty(body, "status") && body.status !== undefined) {
         lines.push(`Status:  ${body.status}`);
     }
     return lines.join("\n");
@@ -2576,10 +2641,13 @@ function formatGraphQLErrorEnvelopeBody(body) {
     return body.errors
         .map((error) => {
         const lines = [`GraphQL error: ${error.message}`];
-        if (error.path !== undefined) {
+        if (hasOwnProperty(error, "path") && error.path !== undefined) {
             lines.push(`  at path: ${error.path.join(".")}`);
         }
-        if (error.extensions?.code !== undefined) {
+        if (hasOwnProperty(error, "extensions") &&
+            error.extensions !== undefined &&
+            hasOwnProperty(error.extensions, "code") &&
+            error.extensions.code !== undefined) {
             lines.push(`  code:    ${error.extensions.code}`);
         }
         return lines.join("\n");
@@ -2882,13 +2950,14 @@ function configureCommanderSuggestionOutput(command) {
 export async function runCLI(roots, options = {}) {
     enableSourceMaps();
     const normalizedRoot = normalizeRoots(roots, process.argv);
-    const root = options.approvals === false ? normalizedRoot : mergeApprovalsGroup(normalizedRoot);
+    const root = options.approvals === true ? mergeApprovalsGroup(normalizedRoot) : normalizedRoot;
     await resolveMcpProxies(root, { projectRoot: options.projectRoot });
     const casing = options.casing ?? "kebab";
     const services = (options.services ?? {});
     const runtimeOptions = options.humanInLoop ?? {};
     const version = options.version ?? findEntrypointPackageMetadata(process.argv[1])?.version;
     const rootUsageName = options.rootUsageName ?? inferProgramName(process.argv);
+    const controls = resolveCLIControls(options.controls);
     const servicesWithBuiltIns = {
         ...services,
         runtimeOptions,
@@ -2908,8 +2977,8 @@ export async function runCLI(roots, options = {}) {
     program.showHelpAfterError();
     program.addHelpCommand(false);
     const presetsEnabled = options.presets === true;
-    const globalLongOptionFlags = getGlobalLongOptionFlags(presetsEnabled, version !== undefined);
-    addGlobalOptions(program, presetsEnabled);
+    const globalLongOptionFlags = getGlobalLongOptionFlags(presetsEnabled, version !== undefined, controls);
+    addGlobalOptions(program, presetsEnabled, controls);
     if (version !== undefined) {
         program.version(version, "--version");
     }
@@ -2923,15 +2992,18 @@ export async function runCLI(roots, options = {}) {
             errorReportContext = context;
         });
     };
+    const rootChildNames = new Set(root.children
+        .filter((candidate) => isNodeVisibleInScope(candidate, "cli"))
+        .map((candidate) => candidate.name));
     for (const child of root.children) {
-        const command = createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled);
+        const command = createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled, controls);
         if (command === null) {
             continue;
         }
         const isDefaultChild = root.default !== undefined &&
             root.default.scope.includes("cli") &&
             (command.name() === root.default.name || command.aliases().includes(root.default.name));
-        program.addCommand(command, isDefaultChild ? { isDefault: true } : undefined);
+        addCommanderChild(program, command, isDefaultChild, rootChildNames);
     }
     configureCommanderSuggestionOutput(program);
     const unknownCommand = findUnknownCommanderCommand(program, process.argv);

package/dist/design.d.ts

@@ -0,0 +1 @@
+export * from "toolcraft-design";

package/dist/design.js

@@ -0,0 +1 @@
+export * from "toolcraft-design";

package/dist/error-codes.d.ts

@@ -0,0 +1 @@
+export declare function hasOwnErrorCode(error: unknown, code: string): error is NodeJS.ErrnoException;

package/dist/error-codes.js

@@ -0,0 +1,6 @@
+export function hasOwnErrorCode(error, code) {
+    return (typeof error === "object" &&
+        error !== null &&
+        Object.prototype.hasOwnProperty.call(error, "code") &&
+        error.code === code);
+}