toolcraft 0.0.53 → 0.0.55

package/dist/cli.js

@@ -887,6 +887,31 @@ function describeHelpValueToken(schema, field) {
     }
     return describeFieldNameValueToken(field.displayPath, field.optionFlag) ?? "value";
 }
+function formatCompactEnumSignatureToken(schema) {
+    if (schema.kind !== "enum" || schema.values.length < 2 || schema.values.length > 3) {
+        return undefined;
+    }
+    const tokens = schema.values.map((value) => String(value));
+    const compact = tokens.every((token) => token.length > 0 &&
+        token.length <= 24 &&
+        token.trim() === token &&
+        !token.includes("|") &&
+        !token.includes("\t") &&
+        !token.includes("\n") &&
+        !token.includes("\r") &&
+        !token.includes(" "));
+    return compact ? tokens.join("|") : undefined;
+}
+function formatCommandParameterFieldFlags(field, globalLongOptionFlags) {
+    if (field.positionalIndex !== undefined || field.schema.kind === "boolean") {
+        return formatHelpFieldFlags(field, globalLongOptionFlags);
+    }
+    const enumToken = formatCompactEnumSignatureToken(field.schema);
+    if (enumToken !== undefined) {
+        return `${formatOptionFlags(field, globalLongOptionFlags)} ${enumToken}`;
+    }
+    return formatHelpFieldFlags(field, globalLongOptionFlags);
+}
 function describeDynamicFieldType(field) {
     if (field.schema.kind === "record") {
         const valueSchema = unwrapOptional(field.schema.value);
@@ -1035,7 +1060,7 @@ function formatCommandParameterTokens(command, casing, globalLongOptionFlags) {
     const fields = assignPositionals(collected.fields, command.positional);
     return fields
         .filter((field) => field.global !== true)
-        .map((field) => wrapOptionalCommandParameterToken(formatHelpFieldFlags(field, globalLongOptionFlags), field.positionalIndex === undefined && (field.optional || field.hasDefault)))
+        .map((field) => wrapOptionalCommandParameterToken(formatCommandParameterFieldFlags(field, globalLongOptionFlags), field.positionalIndex === undefined && (field.optional || field.hasDefault)))
         .concat(collected.dynamicFields.flatMap((field) => formatCommandDynamicParameterTokens(field, casing)));
 }
 function formatCommandRowName(node, casing, globalLongOptionFlags) {
@@ -2011,6 +2036,40 @@ function renderApprovalDeclined(error) {
     logger.error(error.message);
     process.exitCode = 1;
 }
+function renderCliErrorPattern(pattern) {
+    const logger = createLogger();
+    if (pattern.kind === "usage") {
+        logger.error(appendUsagePointer(pattern.message, {
+            rootUsageName: pattern.rootUsageName,
+            commandPath: pattern.commandPath
+        }));
+        process.exitCode = 1;
+        return;
+    }
+    if (pattern.kind === "runtime-user") {
+        logger.error(pattern.message);
+        process.exitCode = 1;
+        return;
+    }
+    if (pattern.kind === "toolcraft-bug") {
+        logger.error(`toolcraft hit an internal invariant: ${pattern.error.message}\n` +
+            `This is a bug in toolcraft or in the command definition; ` +
+            `it cannot be worked around by changing argv. ` +
+            `Re-run with --debug for a stack trace and file an issue.`);
+        if (pattern.debugStackMode !== undefined && pattern.error.stack) {
+            process.stderr.write(`${formatDebugStack(pattern.error.stack, pattern.debugStackMode)}\n`);
+        }
+        process.exitCode = 1;
+        return;
+    }
+    logger.error(pattern.debugStackMode !== undefined
+        ? pattern.message
+        : `${pattern.message} Use --debug for a stack trace.`);
+    if (pattern.debugStackMode !== undefined && pattern.stack !== undefined) {
+        process.stderr.write(`${formatDebugStack(pattern.stack, pattern.debugStackMode)}\n`);
+    }
+    process.exitCode = 1;
+}
 function validateServices(services) {
     for (const name of Object.keys(services)) {
         if (RESERVED_SERVICE_NAMES.has(name)) {
@@ -2837,22 +2896,25 @@ function renderHttpError(error, options) {
 function handleRunError(error, options) {
     const logger = createLogger();
     if (error instanceof UserError) {
-        logger.error(appendUsagePointer(error.message, {
-            rootUsageName: options.rootUsageName,
-            commandPath: options.commandPath
-        }));
-        process.exitCode = 1;
+        renderCliErrorPattern(options.userErrorPattern === "usage"
+            ? {
+                kind: "usage",
+                message: error.message,
+                rootUsageName: options.rootUsageName,
+                commandPath: options.commandPath
+            }
+            : {
+                kind: "runtime-user",
+                message: error.message
+            });
         return;
     }
     if (error instanceof Error && error.name === "ToolcraftBugError") {
-        logger.error(`toolcraft hit an internal invariant: ${error.message}\n` +
-            `This is a bug in toolcraft or in the command definition; ` +
-            `it cannot be worked around by changing argv. ` +
-            `Re-run with --debug for a stack trace and file an issue.`);
-        if (options.debugStackMode !== undefined && error.stack) {
-            process.stderr.write(`${formatDebugStack(error.stack, options.debugStackMode)}\n`);
-        }
-        process.exitCode = 1;
+        renderCliErrorPattern({
+            kind: "toolcraft-bug",
+            error,
+            debugStackMode: options.debugStackMode
+        });
         return;
     }
     if (error instanceof CommanderError) {
@@ -2891,11 +2953,12 @@ function handleRunError(error, options) {
         return;
     }
     const message = error instanceof Error ? error.message : String(error);
-    logger.error(options.debugStackMode !== undefined ? message : `${message} Use --debug for a stack trace.`);
-    if (options.debugStackMode !== undefined && error instanceof Error && error.stack) {
-        process.stderr.write(`${formatDebugStack(error.stack, options.debugStackMode)}\n`);
-    }
-    process.exitCode = 1;
+    renderCliErrorPattern({
+        kind: "unexpected",
+        message,
+        stack: error instanceof Error ? error.stack : undefined,
+        debugStackMode: options.debugStackMode
+    });
 }
 function formatCommanderErrorMessage(error) {
     return error.message.startsWith("error:") ? error.message : `error: ${error.message}`;
@@ -3195,7 +3258,8 @@ export async function runCLI(roots, options = {}) {
             program,
             argv: process.argv,
             rootUsageName,
-            commandPath: resolvedCommandPath
+            commandPath: resolvedCommandPath,
+            userErrorPattern: errorReportContext?.params === undefined ? "usage" : "runtime-user"
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,7 +47,7 @@
     "postpack": "node ../../scripts/manage-bundled-workspace-deps.mjs cleanup . toolcraft-design @poe-code/frontmatter @poe-code/agent-mcp-config @poe-code/agent-human-in-loop @poe-code/task-list @poe-code/agent-defs @poe-code/config-mutations @poe-code/process-runner tiny-mcp-client mcp-oauth auth-store"
   },
   "dependencies": {
-    "toolcraft-schema": "0.0.53",
+    "toolcraft-schema": "0.0.55",
     "commander": "^14.0.3",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",