poe-code 4.0.28 → 4.0.29

package/packages/toolcraft/dist/cli.js

@@ -1169,9 +1169,14 @@ function tokenizeHelpFlags(flags) {
             index = close + 1;
             continue;
         }
-        if (flags.startsWith("--", index) || (flags[index] === "-" && flags[index + 1] !== undefined && flags[index + 1] !== "-")) {
+        if (flags.startsWith("--", index) ||
+            (flags[index] === "-" && flags[index + 1] !== undefined && flags[index + 1] !== "-")) {
             let end = index + 1;
-            while (end < flags.length && flags[end] !== " " && flags[end] !== "[" && flags[end] !== "]" && flags[end] !== "<") {
+            while (end < flags.length &&
+                flags[end] !== " " &&
+                flags[end] !== "[" &&
+                flags[end] !== "]" &&
+                flags[end] !== "<") {
                 end += 1;
             }
             tokens.push({ text: flags.slice(index, end), role: "option" });
@@ -1180,7 +1185,11 @@ function tokenizeHelpFlags(flags) {
         }
         // Enum literals (a|b) or bare words after a flag.
         let end = index + 1;
-        while (end < flags.length && flags[end] !== " " && flags[end] !== "[" && flags[end] !== "]" && flags[end] !== "<") {
+        while (end < flags.length &&
+            flags[end] !== " " &&
+            flags[end] !== "[" &&
+            flags[end] !== "]" &&
+            flags[end] !== "<") {
             end += 1;
         }
         const piece = flags.slice(index, end);
@@ -1621,9 +1630,7 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
                 // Positionals are declared optional so resolveParams stays the single owner of argument
                 // validation: Commander would otherwise report a missing positional in its own words
                 // before prompts, defaults, and presets have had a chance to supply the value.
-                command.argument(field.variadicPosition === true
-                    ? `[${field.displayPath}...]`
-                    : `[${field.displayPath}]`);
+                command.argument(field.variadicPosition === true ? `[${field.displayPath}...]` : `[${field.displayPath}]`);
                 continue;
             }
             for (const option of createOption(field, globalLongOptionFlags)) {
@@ -1869,7 +1876,9 @@ function addGlobalOptions(command, presetsEnabled, controls) {
     }
     if (controls.output) {
         const choices = outputFormatNames(controls);
-        options.push(new Option("--output <format>", "Output format.").choices(choices).argParser((value) => {
+        options.push(new Option("--output <format>", "Output format.")
+            .choices(choices)
+            .argParser((value) => {
             if (value === "rich" || value === "md" || value === "json") {
                 return value;
             }
@@ -2591,8 +2600,8 @@ function renderCliErrorPattern(pattern, outputEmitter) {
     }
     if (pattern.kind === "definition") {
         logger.error(`Command definition error: ${pattern.error.message}\n` +
-            "This is a bug in the generated command definition, not in your command arguments.\n" +
-            "Run with --debug for a stack trace.");
+            "This is a bug in the generated command definition, not in your command arguments." +
+            (pattern.debugControlEnabled ? "\nRun with --debug for a stack trace." : ""));
         if (pattern.debugStackMode !== undefined && pattern.error.stack) {
             process.stderr.write(`${formatDebugStack(pattern.error.stack, pattern.debugStackMode)}\n`);
         }
@@ -2602,15 +2611,17 @@ function renderCliErrorPattern(pattern, outputEmitter) {
     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.`);
+            `it cannot be worked around by changing argv.` +
+            (pattern.debugControlEnabled
+                ? ` Re-run with --debug for a stack trace and file an issue.`
+                : " 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
+    logger.error(pattern.debugStackMode !== undefined || !pattern.debugControlEnabled
         ? pattern.message
         : `${pattern.message} Use --debug for a stack trace.`);
     if (pattern.debugStackMode !== undefined && pattern.stack !== undefined) {
@@ -3600,6 +3611,7 @@ async function handleRunError(error, options) {
                 ? {
                     kind: "definition",
                     error,
+                    debugControlEnabled: options.debugControlEnabled,
                     debugStackMode: options.debugStackMode
                 }
                 : options.userErrorPattern === "usage"
@@ -3619,6 +3631,7 @@ async function handleRunError(error, options) {
             renderCliErrorPattern({
                 kind: "toolcraft-bug",
                 error,
+                debugControlEnabled: options.debugControlEnabled,
                 debugStackMode: options.debugStackMode
             }, options.outputEmitter);
             return;
@@ -3663,6 +3676,7 @@ async function handleRunError(error, options) {
             kind: "unexpected",
             message,
             stack: error instanceof Error ? error.stack : undefined,
+            debugControlEnabled: options.debugControlEnabled,
             debugStackMode: options.debugStackMode
         }, options.outputEmitter);
     });
@@ -4021,9 +4035,12 @@ export async function runCLI(roots, options = {}) {
             process.stderr.write(`Saved error report to ${report.displayPath}\n`);
         }
         await handleRunError(error, {
-            debugStackMode: resolvedFlags !== undefined
-                ? resolveDebugStackMode(resolvedFlags.debug)
-                : getDebugStackModeFromArgv(argv),
+            debugControlEnabled: controls.debug,
+            debugStackMode: controls.debug
+                ? resolvedFlags !== undefined
+                    ? resolveDebugStackMode(resolvedFlags.debug)
+                    : getDebugStackModeFromArgv(argv)
+                : undefined,
             output: resolvedFlags !== undefined
                 ? resolveOutput(resolvedFlags)
                 : resolveOutputFromArgv(argv, controls.outputFormats),