toolcraft 0.0.19 → 0.0.20

package/dist/cli.js

@@ -942,28 +942,16 @@ function formatCommandRows(group, scope, casing, globalLongOptionFlags) {
         description: child.description ?? ""
     }));
 }
-function formatGlobalOptionRows(ctx) {
-    const rows = [];
+function formatGlobalOptionsLine(ctx) {
+    const flags = [];
     if (ctx.presetsEnabled) {
-        rows.push({
-            flags: "--preset <path>",
-            description: "Load parameter defaults from a JSON file"
-        });
+        flags.push("--preset <path>");
     }
-    rows.push({
-        flags: "--yes",
-        description: "Accept defaults, skip prompts"
-    }, {
-        flags: "--output <format>",
-        description: "Output format: rich, md, json."
-    });
+    flags.push("--yes", "--output <format>");
     if (ctx.showVersion) {
-        rows.push({
-            flags: "--version",
-            description: "Show version"
-        });
+        flags.push("--version");
     }
-    return rows;
+    return `${text.section("Options:")} ${flags.join("  ")}`;
 }
 function collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlags) {
     const seen = new Map();
@@ -1023,11 +1011,14 @@ function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUs
         sections.push(`${text.sectionHeader("Commands")}\n${formatHelpCommandList(commandRows)}`);
     }
     if (isRoot) {
-        const globalRows = [
-            ...formatGlobalOptionRows(globalOptions),
-            ...collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlags)
-        ];
-        sections.push(`${text.sectionHeader("Options")}\n${formatHelpOptionList(globalRows)}`);
+        const schemaGlobalRows = collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlags);
+        const builtInLine = formatGlobalOptionsLine(globalOptions);
+        if (schemaGlobalRows.length > 0) {
+            sections.push(`${text.sectionHeader("Options")}\n${formatHelpOptionList(schemaGlobalRows)}\n${builtInLine}`);
+        }
+        else {
+            sections.push(builtInLine);
+        }
     }
     return renderHelpDocument({
         breadcrumb,
@@ -1177,12 +1168,12 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
     return group;
 }
 function addGlobalOptions(command, presetsEnabled) {
+    const options = [];
     if (presetsEnabled) {
-        command.option("--preset <path>", "Load parameter defaults from a JSON file.");
+        options.push(new Option("--preset <path>", "Load parameter defaults from a JSON file."));
     }
-    command
-        .option("--yes", "Accept defaults and skip prompts.")
-        .option("--output <format>", "Output format.", (value) => {
+    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;
         }
@@ -1193,11 +1184,15 @@ function addGlobalOptions(command, presetsEnabled) {
             candidates: ["rich", "markdown", "json"],
             threshold: 3
         }));
-    })
-        .addOption(new Option("--debug [mode]", "Print stack traces for unexpected errors.")
+    }));
+    options.push(new Option("--debug [mode]", "Print stack traces for unexpected errors.")
         .preset("trim")
-        .argParser(parseDebugStackMode))
-        .option("--verbose", "Print detailed runtime diagnostics.");
+        .argParser(parseDebugStackMode));
+    options.push(new Option("--verbose", "Print detailed runtime diagnostics."));
+    for (const option of options) {
+        option.hideHelp(true);
+        command.addOption(option);
+    }
 }
 function parseDebugStackMode(value) {
     if (value === true || value === "trim") {
@@ -1235,6 +1230,9 @@ function formatResolvedValue(value) {
     }
     return JSON.stringify(value);
 }
+function fieldPromptLabel(field) {
+    return field.positionalIndex === undefined ? field.optionFlag : `<${field.displayPath}>`;
+}
 async function promptForField(field) {
     const schema = field.schema;
     if (schema.kind === "enum") {
@@ -1245,7 +1243,7 @@ async function promptForField(field) {
                 value
             }));
         const selected = await select({
-            message: field.description ?? field.displayPath,
+            message: field.description ?? fieldPromptLabel(field),
             options,
             initialValue: field.hasDefault ? field.defaultValue : undefined
         });
@@ -1257,7 +1255,7 @@ async function promptForField(field) {
     }
     if (field.schema.kind === "boolean") {
         const selected = await confirm({
-            message: field.displayPath,
+            message: fieldPromptLabel(field),
             initialValue: field.hasDefault ? Boolean(field.defaultValue) : undefined
         });
         if (isCancel(selected)) {
@@ -1267,7 +1265,7 @@ async function promptForField(field) {
         return selected;
     }
     const entered = await promptText({
-        message: field.displayPath,
+        message: fieldPromptLabel(field),
         initialValue: field.hasDefault && field.defaultValue !== undefined
             ? formatResolvedValue(field.defaultValue)
             : undefined

package/node_modules/@poe-code/design-system/dist/prompts/index.d.ts

@@ -58,7 +58,7 @@ export type SpinnerOptions = {
     message: (message?: string) => void;
 };
 export interface WithSpinnerOptions<T> {
-    message: string;
+    message: string | (() => string);
     fn: () => Promise<T>;
     stopMessage?: (result: T) => string;
     subtext?: (result: T) => string | undefined;

package/node_modules/@poe-code/design-system/dist/prompts/index.js

@@ -80,6 +80,7 @@ function formatElapsed(ms) {
 }
 export async function withSpinner(options) {
     const { message, fn, stopMessage, subtext } = options;
+    const readMessage = () => (typeof message === "function" ? message() : message);
     if (resolveOutputFormat() === "json") {
         const result = await fn();
         const sub = subtext ? subtext(result) : undefined;
@@ -106,9 +107,9 @@ export async function withSpinner(options) {
     }
     const s = spinner();
     const start = Date.now();
-    s.start(message);
+    s.start(readMessage());
     const timer = setInterval(() => {
-        s.message(`${message} [${formatElapsed(Date.now() - start)}]`);
+        s.message(`${readMessage()} [${formatElapsed(Date.now() - start)}]`);
     }, 1000);
     try {
         const result = await fn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
     "jsonc-parser": "^3.3.1",
     "smol-toml": "^1.3.0",
     "tiny-stdio-mcp-server": "^0.1.0",
-    "toolcraft-schema": "^0.0.19",
+    "toolcraft-schema": "^0.0.20",
     "yaml": "^2.8.2"
   },
   "files": [