toolcraft 0.0.55 → 0.0.57

package/dist/cli.d.ts

@@ -13,6 +13,7 @@ export interface CLIControls {
 export interface RunCLIOptions<TServices extends object = Record<string, unknown>> {
     apiVersion?: string;
     approvals?: boolean;
+    argv?: readonly string[];
     casing?: Casing;
     controls?: CLIControls;
     fetch?: typeof globalThis.fetch;

package/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",
@@ -2893,71 +2924,73 @@ 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) {
-        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") {
-        renderCliErrorPattern({
-            kind: "toolcraft-bug",
-            error,
-            debugStackMode: options.debugStackMode
-        });
-        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);
-    renderCliErrorPattern({
-        kind: "unexpected",
-        message,
-        stack: error instanceof Error ? error.stack : undefined,
-        debugStackMode: options.debugStackMode
+        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) {
@@ -3156,15 +3189,16 @@ function configureCommanderSuggestionOutput(command) {
 }
 export async function runCLI(roots, options = {}) {
     enableSourceMaps();
-    const normalizedRoot = normalizeRoots(roots, process.argv);
+    const argv = [...(options.argv ?? process.argv)];
+    const normalizedRoot = normalizeRoots(roots, argv);
     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 runtimeFetch = options.fetch ?? globalThis.fetch;
-    const version = options.version ?? findEntrypointPackageMetadata(process.argv[1])?.version;
-    const rootUsageName = options.rootUsageName ?? inferProgramName(process.argv);
+    const version = options.version ?? findEntrypointPackageMetadata(argv[1])?.version;
+    const rootUsageName = options.rootUsageName ?? inferProgramName(argv);
     const controls = resolveCLIControls(options.controls);
     const servicesWithBuiltIns = {
         ...services,
@@ -3175,8 +3209,8 @@ export async function runCLI(roots, options = {}) {
         apiVersion: options.apiVersion
     };
     validateServices(services);
-    if (hasHelpFlag(process.argv)) {
-        await renderGeneratedHelp(root, process.argv, { ...options, version });
+    if (hasHelpFlag(argv)) {
+        await renderGeneratedHelp(root, argv, { ...options, version });
         return;
     }
     const program = new CommanderCommand();
@@ -3217,7 +3251,7 @@ export async function runCLI(roots, options = {}) {
         addCommanderChild(program, command, isDefaultChild, rootChildNames);
     }
     configureCommanderSuggestionOutput(program);
-    const unknownCommand = findUnknownCommanderCommand(program, process.argv);
+    const unknownCommand = findUnknownCommanderCommand(program, argv);
     if (unknownCommand !== undefined) {
         createLogger().error(appendUsagePointer(formatUnknownCommandMessage(unknownCommand.input, unknownCommand.currentCommand), {
             rootUsageName,
@@ -3227,7 +3261,7 @@ export async function runCLI(roots, options = {}) {
         return;
     }
     try {
-        await program.parseAsync(process.argv);
+        await program.parseAsync(argv);
     }
     catch (error) {
         if (error instanceof ApprovalDeclinedError) {
@@ -3236,7 +3270,7 @@ export async function runCLI(roots, options = {}) {
         }
         const resolvedFlags = lastActionCommand ? getResolvedFlags(lastActionCommand) : undefined;
         const report = await writeErrorReport({
-            argv: process.argv,
+            argv,
             command: errorReportContext?.command,
             commandPath: errorReportContext?.commandPath ?? resolvedCommandPath,
             env: process.env,
@@ -3250,13 +3284,16 @@ 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),
-            verbose: resolvedFlags ? Boolean(resolvedFlags.verbose) : process.argv.includes("--verbose"),
+                : getDebugStackModeFromArgv(argv),
+            output: resolvedFlags !== undefined
+                ? resolveOutput(resolvedFlags)
+                : resolveOutputFromArgv(argv),
+            verbose: resolvedFlags ? Boolean(resolvedFlags.verbose) : argv.includes("--verbose"),
             program,
-            argv: process.argv,
+            argv,
             rootUsageName,
             commandPath: resolvedCommandPath,
             userErrorPattern: errorReportContext?.params === undefined ? "usage" : "runtime-user"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.55",
+  "version": "0.0.57",
   "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.55",
+    "toolcraft-schema": "0.0.57",
     "commander": "^14.0.3",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",