poe-code 3.0.372 → 3.0.374

package/packages/toolcraft/dist/cli.js

@@ -1527,6 +1527,37 @@ function resolveOutput(resolvedFlags) {
     }
     return "rich";
 }
+function resolveOutputFromArgv(argv) {
+    for (let index = 0; index < argv.length; index += 1) {
+        const token = argv[index] ?? "";
+        if (token === "--json") {
+            return "json";
+        }
+        if (token === "--md" || token === "--markdown") {
+            return "md";
+        }
+        if (token === "--output") {
+            const value = argv[index + 1];
+            if (value === "rich" || value === "md" || value === "json") {
+                return value;
+            }
+            if (value === "markdown") {
+                return "md";
+            }
+            continue;
+        }
+        if (token.startsWith("--output=")) {
+            const value = token.slice("--output=".length);
+            if (value === "rich" || value === "md" || value === "json") {
+                return value;
+            }
+            if (value === "markdown") {
+                return "md";
+            }
+        }
+    }
+    return "rich";
+}
 const DESIGN_SYSTEM_OUTPUT_BY_MODE = {
     rich: "terminal",
     md: "markdown",
@@ -2036,6 +2067,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)) {
@@ -2859,68 +2924,74 @@ function renderHttpError(error, options) {
         process.stderr.write(`${formatDebugStack(stack, options.debugStackMode)}\n`);
     }
 }
-function handleRunError(error, options) {
+async 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;
-        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;
-        return;
-    }
-    if (error instanceof CommanderError) {
-        process.exitCode = error.exitCode;
-        if (error.code === "commander.helpDisplayed" || error.code === "commander.version") {
+    await withOutputFormat(options.output, async () => {
+        if (error instanceof UserError) {
+            renderCliErrorPattern(options.userErrorPattern === "usage"
+                ? {
+                    kind: "usage",
+                    message: error.message,
+                    rootUsageName: options.rootUsageName,
+                    commandPath: options.commandPath
+                }
+                : {
+                    kind: "runtime-user",
+                    message: error.message
+                });
             return;
         }
-        if (error.code === "commander.unknownCommand") {
-            logger.error(appendUsagePointer(formatUnknownCommandError(error, options.program, options.argv ?? process.argv), {
-                rootUsageName: options.rootUsageName,
-                commandPath: options.commandPath
-            }));
+        if (error instanceof Error && error.name === "ToolcraftBugError") {
+            renderCliErrorPattern({
+                kind: "toolcraft-bug",
+                error,
+                debugStackMode: options.debugStackMode
+            });
             return;
         }
-        if (error.code === "commander.unknownOption") {
-            const argv = options.argv ?? process.argv;
-            logger.error(appendUsagePointer(formatUnknownOptionError(error, options.program, argv), {
+        if (error instanceof CommanderError) {
+            process.exitCode = error.exitCode;
+            if (error.code === "commander.helpDisplayed" || error.code === "commander.version") {
+                return;
+            }
+            if (error.code === "commander.unknownCommand") {
+                logger.error(appendUsagePointer(formatUnknownCommandError(error, options.program, options.argv ?? process.argv), {
+                    rootUsageName: options.rootUsageName,
+                    commandPath: options.commandPath
+                }));
+                return;
+            }
+            if (error.code === "commander.unknownOption") {
+                const argv = options.argv ?? process.argv;
+                logger.error(appendUsagePointer(formatUnknownOptionError(error, options.program, argv), {
+                    rootUsageName: options.rootUsageName,
+                    commandPath: options.commandPath.length > 0
+                        ? options.commandPath
+                        : findCurrentCommanderCommandPath(options.program, argv)
+                }));
+                return;
+            }
+            logger.error(appendUsagePointer(formatCommanderErrorMessage(error), {
                 rootUsageName: options.rootUsageName,
                 commandPath: options.commandPath.length > 0
                     ? options.commandPath
-                    : findCurrentCommanderCommandPath(options.program, argv)
+                    : findCurrentCommanderCommandPath(options.program, options.argv ?? process.argv)
             }));
             return;
         }
-        logger.error(appendUsagePointer(formatCommanderErrorMessage(error), {
-            rootUsageName: options.rootUsageName,
-            commandPath: options.commandPath.length > 0
-                ? options.commandPath
-                : findCurrentCommanderCommandPath(options.program, options.argv ?? process.argv)
-        }));
-        return;
-    }
-    if (isHttpErrorLike(error)) {
-        renderHttpError(error, options);
-        process.exitCode = 1;
-        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;
+        if (isHttpErrorLike(error)) {
+            renderHttpError(error, options);
+            process.exitCode = 1;
+            return;
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        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}`;
@@ -3212,15 +3283,19 @@ export async function runCLI(roots, options = {}) {
         if (report !== undefined) {
             process.stderr.write(`Saved error report to ${report.displayPath}\n`);
         }
-        handleRunError(error, {
+        await handleRunError(error, {
             debugStackMode: resolvedFlags !== undefined
                 ? resolveDebugStackMode(resolvedFlags.debug)
                 : getDebugStackModeFromArgv(process.argv),
+            output: resolvedFlags !== undefined
+                ? resolveOutput(resolvedFlags)
+                : resolveOutputFromArgv(process.argv),
             verbose: resolvedFlags ? Boolean(resolvedFlags.verbose) : process.argv.includes("--verbose"),
             program,
             argv: process.argv,
             rootUsageName,
-            commandPath: resolvedCommandPath
+            commandPath: resolvedCommandPath,
+            userErrorPattern: errorReportContext?.params === undefined ? "usage" : "runtime-user"
         });
     }
 }