terminal-pilot 0.0.45 → 0.0.47

package/dist/cli.js

@@ -555,6 +555,42 @@ function formatReceivedDiscriminator(value) {
   return receivedValue(value);
 }
 
+// ../toolcraft-schema/src/json-schema/compiler.ts
+var draftTypes = ["null", "boolean", "object", "array", "number", "integer", "string"];
+var draftTypeSet = new Set(draftTypes);
+var metaSchemaKeywordProperties = {
+  type: {
+    anyOf: [
+      { enum: draftTypes },
+      { type: "array", items: { enum: draftTypes }, minItems: 1, uniqueItems: true }
+    ]
+  },
+  minLength: { type: "integer", minimum: 0 },
+  maxLength: { type: "integer", minimum: 0 },
+  minItems: { type: "integer", minimum: 0 },
+  maxItems: { type: "integer", minimum: 0 },
+  minProperties: { type: "integer", minimum: 0 },
+  maxProperties: { type: "integer", minimum: 0 }
+};
+var builtInRegistry = {
+  "https://json-schema.org/draft/2020-12/schema": {
+    $id: "https://json-schema.org/draft/2020-12/schema",
+    type: ["object", "boolean"],
+    properties: {
+      ...metaSchemaKeywordProperties,
+      $defs: { type: "object", additionalProperties: { $ref: "#" } }
+    }
+  },
+  "http://json-schema.org/draft-07/schema": {
+    $id: "http://json-schema.org/draft-07/schema#",
+    type: ["object", "boolean"],
+    properties: {
+      ...metaSchemaKeywordProperties,
+      definitions: { type: "object", additionalProperties: { $ref: "#" } }
+    }
+  }
+};
+
 // ../toolcraft-schema/src/index.ts
 function assertValidEnumValues(values) {
   if (values.length === 0) {
@@ -3468,7 +3504,7 @@ function damerauLevenshtein(left, right) {
 // ../toolcraft/src/stream.ts
 function validationMessage(schema, value) {
   const result = validate(schema, value);
-  return result.ok ? void 0 : result.issues.map((issue) => issue.message).join("; ");
+  return result.ok ? void 0 : result.issues.map((issue2) => issue2.message).join("; ");
 }
 function createManagedStream(options) {
   const controller = new AbortController();
@@ -4701,6 +4737,41 @@ async function writeErrorReport(context) {
   };
 }
 
+// ../toolcraft/src/human-in-loop/wiring.ts
+var WIRING_HINT = 'pass { humanInLoop: createHumanInLoop({ provider, ... }) } from "toolcraft/human-in-loop"';
+function assertHumanInLoopWired(root, humanInLoop) {
+  if (humanInLoop !== void 0) {
+    return;
+  }
+  const commandPath = findHumanInLoopCommandPath(root, []);
+  if (commandPath !== void 0) {
+    throw new UserError(
+      `command '${commandPath}' declares humanInLoop but no runtime is wired \u2014 ${WIRING_HINT}`
+    );
+  }
+}
+function mergeApprovalsRoot(root, options) {
+  if (options.approvals !== true) {
+    return root;
+  }
+  if (options.humanInLoop === void 0) {
+    throw new UserError(`approvals: true requires a wired humanInLoop runtime \u2014 ${WIRING_HINT}`);
+  }
+  return options.humanInLoop.mergeApprovalsGroup(root);
+}
+function findHumanInLoopCommandPath(node, path16) {
+  if (node.kind === "command") {
+    return node.humanInLoop ? path16.join(".") || node.name : void 0;
+  }
+  for (const child of node.children) {
+    const found = findHumanInLoopCommandPath(child, [...path16, child.name]);
+    if (found !== void 0) {
+      return found;
+    }
+  }
+  return void 0;
+}
+
 // ../toolcraft/src/number-schema.ts
 function isValidNumberSchemaValue(value, schema) {
   return typeof value === "number" && Number.isFinite(value) && (schema.jsonType !== "integer" || Number.isInteger(value)) && (schema.minimum === void 0 || value >= schema.minimum) && (schema.maximum === void 0 || value <= schema.maximum);
@@ -4835,11 +4906,11 @@ function isPlainObject3(value) {
 
 // ../toolcraft/src/renderer.ts
 import YAML from "yaml";
-function isObject(value) {
+function isObject2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isMcpCallToolResult(value) {
-  if (!isObject(value)) {
+  if (!isObject2(value)) {
     return false;
   }
   const hasContent = Array.isArray(value.content);
@@ -4852,11 +4923,11 @@ function isMcpCallToolResult(value) {
   );
 }
 function isMcpTextContent(value) {
-  return isObject(value) && value.type === "text" && typeof value.text === "string";
+  return isObject2(value) && value.type === "text" && typeof value.text === "string";
 }
 function extractMcpPayload(envelope) {
   const structuredContent = envelope.structuredContent;
-  if (isObject(structuredContent) && "result" in structuredContent) {
+  if (isObject2(structuredContent) && "result" in structuredContent) {
     return structuredContent.result;
   }
   if (structuredContent !== void 0) {
@@ -4878,10 +4949,10 @@ function unwrapMcpEnvelope(result) {
   };
 }
 function isArrayOfObjects(value) {
-  return Array.isArray(value) && value.every((entry) => isObject(entry));
+  return Array.isArray(value) && value.every((entry) => isObject2(entry));
 }
 function isNonEmptyArrayOfObjects(value) {
-  return Array.isArray(value) && value.length > 0 && value.every((entry) => isObject(entry));
+  return Array.isArray(value) && value.length > 0 && value.every((entry) => isObject2(entry));
 }
 function stringifyValue(value) {
   if (value === void 0) {
@@ -4928,7 +4999,7 @@ function detailRows(result, depth = 0) {
   const rows = [];
   for (const [key, value] of Object.entries(result)) {
     const label = `${"  ".repeat(depth)}${humanizeKey(key)}`;
-    if (isObject(value)) {
+    if (isObject2(value)) {
       if (Object.keys(value).length === 0) {
         rows.push({ label, value: "{}" });
         continue;
@@ -4961,7 +5032,7 @@ function displayScalar(value) {
   if (typeof value === "boolean") {
     return value ? "Yes" : "No";
   }
-  if (Array.isArray(value) && value.every((entry) => !isObject(entry) && !Array.isArray(entry))) {
+  if (Array.isArray(value) && value.every((entry) => !isObject2(entry) && !Array.isArray(entry))) {
     return value.map((entry) => displayScalar(entry)).join(", ") || "\u2014";
   }
   return stringifyValue(value) || "\u2014";
@@ -4982,10 +5053,10 @@ function displayRowValue(value) {
   return isUrl(value) ? compactUrl(value) : displayScalar(value);
 }
 function directScalarRows(result) {
-  return Object.entries(result).filter(([, value]) => !isObject(value) && !Array.isArray(value)).map(([key, value]) => ({ label: humanizeKey(key), value: displayRowValue(value) }));
+  return Object.entries(result).filter(([, value]) => !isObject2(value) && !Array.isArray(value)).map(([key, value]) => ({ label: humanizeKey(key), value: displayRowValue(value) }));
 }
 function directObjectSections(result) {
-  return Object.entries(result).filter(([, value]) => isObject(value)).map(([key, value]) => ({ title: humanizeKey(key), rows: detailRows(value) })).filter((section) => section.rows.length > 0);
+  return Object.entries(result).filter(([, value]) => isObject2(value)).map(([key, value]) => ({ title: humanizeKey(key), rows: detailRows(value) })).filter((section) => section.rows.length > 0);
 }
 function directArrayObjectSections(result) {
   return Object.entries(result).flatMap(([key, value]) => {
@@ -5092,7 +5163,7 @@ function autoRender(command, result, output, primitives) {
   if (output === "rich" && Array.isArray(result) && result.every((value) => typeof value === "string")) {
     return result.join("\n");
   }
-  if (isObject(result)) {
+  if (isObject2(result)) {
     if (output === "md") {
       return renderObjectMarkdown(result);
     }
@@ -5349,8 +5420,6 @@ function validateServices(services) {
 configureTheme({ brand: "blue", label: "Toolcraft" });
 var NULL_OPTION_VALUE = /* @__PURE__ */ Symbol("toolcraft.cli.null");
 var optionalModulePaths = {
-  approvals: "./human-in-loop/approvals-commands.js",
-  humanInLoop: "./human-in-loop/gate.js",
   mcpProxy: "./mcp-proxy.js"
 };
 function importOptionalModule(specifier) {
@@ -5989,14 +6058,37 @@ function createOption(field, globalLongOptionFlags) {
   return [option];
 }
 function resolveCLIControls(controls) {
+  const outputFormats = typeof controls?.output === "object" ? controls.output.formats ?? {} : {};
+  validateOutputFormats(outputFormats);
   return {
     debug: controls?.debug === true,
     logLevel: controls?.logLevel === true,
-    output: controls?.output === true,
+    output: controls?.output === true || typeof controls?.output === "object",
+    outputFormats,
     verbose: controls?.verbose === true,
     yes: controls?.yes === true
   };
 }
+var BUILT_IN_OUTPUT_FORMATS = ["rich", "md", "markdown", "json"];
+function outputFormatNames(controls) {
+  return [...BUILT_IN_OUTPUT_FORMATS, ...Object.keys(controls.outputFormats)];
+}
+function validateOutputFormats(formats) {
+  for (const [name, renderer] of Object.entries(formats)) {
+    const hasWhitespace = name.split("").some((character) => character.trim() === "");
+    if (name.length === 0 || name.trim() !== name || hasWhitespace) {
+      throw new ToolcraftBugError(
+        `Custom output format names must be non-empty and contain no whitespace: ${JSON.stringify(name)}.`
+      );
+    }
+    if (BUILT_IN_OUTPUT_FORMATS.includes(name)) {
+      throw new ToolcraftBugError(`Custom output format "${name}" conflicts with a built-in format.`);
+    }
+    if (typeof renderer !== "function") {
+      throw new ToolcraftBugError(`Custom output format "${name}" must define a renderer function.`);
+    }
+  }
+}
 function getGlobalLongOptionFlags(presetsEnabled, versionEnabled, controls) {
   const flags = [];
   if (presetsEnabled) {
@@ -6481,7 +6573,7 @@ function formatGlobalOptionsLine(ctx) {
     flags.push("--yes");
   }
   if (ctx.controls.output) {
-    flags.push("--output <format>");
+    flags.push(`--output <${outputFormatNames(ctx.controls).join("|")}>`);
   }
   if (ctx.controls.verbose) {
     flags.push("-v, --verbose");
@@ -6926,17 +7018,21 @@ function addGlobalOptions(command, presetsEnabled, controls) {
     options.push(new Option("--yes", "Accept defaults and skip prompts."));
   }
   if (controls.output) {
+    const choices2 = outputFormatNames(controls);
     options.push(
-      new Option("--output <format>", "Output format.").argParser((value) => {
+      new Option("--output <format>", "Output format.").choices(choices2).argParser((value) => {
         if (value === "rich" || value === "md" || value === "json") {
           return value;
         }
         if (value === "markdown") {
           return "md";
         }
+        if (Object.hasOwn(controls.outputFormats, value)) {
+          return value;
+        }
         throw new InvalidArgumentError(
-          formatInvalidEnumMessage("--output", value, ["rich", "md", "markdown", "json"], {
-            candidates: ["rich", "markdown", "json"],
+          formatInvalidEnumMessage("--output", value, choices2, {
+            candidates: ["rich", "markdown", "json", ...Object.keys(controls.outputFormats)],
             threshold: 3
           })
         );
@@ -7126,11 +7222,11 @@ function resolveOutput(resolvedFlags) {
     return "json";
   }
   if (resolvedFlags.output !== void 0) {
-    return resolvedFlags.output;
+    return resolvedFlags.output === "markdown" ? "md" : resolvedFlags.output;
   }
   return "rich";
 }
-function resolveOutputFromArgv(argv) {
+function resolveOutputFromArgv(argv, formats = {}) {
   for (let index = 0; index < argv.length; index += 1) {
     const token = argv[index] ?? "";
     if (token === "--json") {
@@ -7147,6 +7243,9 @@ function resolveOutputFromArgv(argv) {
       if (value === "markdown") {
         return "md";
       }
+      if (value !== void 0 && Object.hasOwn(formats, value)) {
+        return value;
+      }
       continue;
     }
     if (token.startsWith("--output=")) {
@@ -7157,17 +7256,21 @@ function resolveOutputFromArgv(argv) {
       if (value === "markdown") {
         return "md";
       }
+      if (Object.hasOwn(formats, value)) {
+        return value;
+      }
     }
   }
   return "rich";
 }
-var DESIGN_SYSTEM_OUTPUT_BY_MODE = {
-  rich: "terminal",
-  md: "markdown",
-  json: "json"
-};
 function toDesignSystemOutput(output) {
-  return DESIGN_SYSTEM_OUTPUT_BY_MODE[output];
+  if (output === "md") {
+    return "markdown";
+  }
+  if (output === "json") {
+    return "json";
+  }
+  return "terminal";
 }
 async function withOutputFormat2(output, fn) {
   const previous = process.env.OUTPUT_FORMAT;
@@ -8310,9 +8413,9 @@ async function resolveParams(fields, dynamicFields, variants, positionalValues,
       const validation = validate(field.schema, value);
       if (!validation.ok) {
         errors.push(
-          ...validation.issues.map((issue) => ({
+          ...validation.issues.map((issue2) => ({
             path: field.displayPath,
-            message: issue.message
+            message: issue2.message
           }))
         );
         continue;
@@ -8384,17 +8487,18 @@ function getResolvedFlags(command) {
   const flags = command.optsWithGlobals();
   return flags;
 }
-async function executeCommand(state, services, requirementOptions, runtimeFetch, runtimeOptions, runtimeEnv, runtimeFs, outputEmitter, promptStreams, diagnosticsOptions, onErrorReportContext) {
+async function executeCommand(state, services, requirementOptions, runtimeFetch, humanInLoop, runtimeEnv, runtimeFs, outputEmitter, outputFormats, promptStreams, diagnosticsOptions, onErrorReportContext) {
   const logger2 = createLogger(outputEmitter);
+  const optionValues = state.actionCommand.optsWithGlobals();
+  const resolvedFlags = optionValues;
+  const output = resolveOutput(resolvedFlags);
   const primitives = {
     logger: logger2,
     renderTable,
     getTheme,
-    note
+    note,
+    outputFormat: output
   };
-  const optionValues = state.actionCommand.optsWithGlobals();
-  const resolvedFlags = optionValues;
-  const output = resolveOutput(resolvedFlags);
   const diagnostics = createRuntimeLogger({
     level: resolvedFlags.logLevel ?? (diagnosticsOptions.verboseControlEnabled && resolvedFlags.verbose ? "trace" : diagnosticsOptions.logLevel),
     logger: diagnosticsOptions.logger ?? writeCLIDiagnosticEvent
@@ -8407,7 +8511,7 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
   const missingParameterContext = !resolvedFlags.yes && output === "rich" && stdinTTY && stdoutTTY ? {
     commandPath: state.commandPath,
     params: {},
-    output,
+    output: "rich",
     stdinTTY,
     stdoutTTY
   } : void 0;
@@ -8494,12 +8598,15 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
                 outputEmitter(line);
               }
             } else {
-              renderResult(
+              renderCLIResult(
                 state.command,
+                state.commandPath,
                 event,
                 output,
                 primitives,
-                outputEmitter === void 0 ? void 0 : (chunk) => outputEmitter(chunk.endsWith("\n") ? chunk.slice(0, -1) : chunk)
+                outputFormats,
+                outputEmitter === void 0 ? void 0 : (chunk) => outputEmitter(chunk.endsWith("\n") ? chunk.slice(0, -1) : chunk),
+                outputEmitter
               );
             }
           }
@@ -8531,9 +8638,7 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
           throw new UserError("Operation cancelled.");
         }
       }
-      const result = state.command.humanInLoop ? await (await importOptionalModule(
-        optionalModulePaths.humanInLoop
-      )).invokeWithHumanInLoop(state.command, context, runtimeOptions, state.commandPath) : await state.command.handler(context);
+      const result = state.command.humanInLoop && humanInLoop !== void 0 ? await humanInLoop.invoke(state.command, context, state.commandPath) : await state.command.handler(context);
       if (output === "rich" && runtime.isFixture) {
         writeRichHeader(`${state.command.name} (fixture)`);
       }
@@ -8541,12 +8646,15 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
         renderHumanInLoopPending(result);
         return;
       }
-      const renderStatus = renderResult(
+      const renderStatus = renderCLIResult(
         state.command,
+        state.commandPath,
         result,
         output,
         primitives,
-        outputEmitter === void 0 ? void 0 : (chunk) => outputEmitter(chunk.endsWith("\n") ? chunk.slice(0, -1) : chunk)
+        outputFormats,
+        outputEmitter === void 0 ? void 0 : (chunk) => outputEmitter(chunk.endsWith("\n") ? chunk.slice(0, -1) : chunk),
+        outputEmitter
       );
       if (renderStatus.mcpError) {
         process.exitCode = 1;
@@ -8562,6 +8670,23 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
     throw error3;
   }
 }
+function renderCLIResult(command, commandPath, result, output, primitives, outputFormats, write2, emitExact) {
+  const customRenderer = outputFormats[output];
+  if (customRenderer === void 0) {
+    return renderResult(command, result, output, primitives, write2);
+  }
+  const payload = customRenderer({ command, commandPath, primitives, result });
+  if (payload !== void 0 && payload.length > 0) {
+    if (emitExact !== void 0) {
+      emitExact(payload);
+    } else if (write2 === void 0) {
+      process.stdout.write(payload);
+    } else {
+      write2(payload);
+    }
+  }
+  return { mcpError: false };
+}
 function isStringRecord(value) {
   return isPlainObject4(value) && Object.values(value).every((entry) => typeof entry === "string");
 }
@@ -9099,20 +9224,19 @@ async function runCLI(roots, options = {}) {
   let errorReportContext;
   try {
     const normalizedRoot = normalizeRoots(roots, argv);
-    const root = options.approvals === true ? (await importOptionalModule(
-      optionalModulePaths.approvals
-    )).mergeApprovalsGroup(normalizedRoot) : normalizedRoot;
+    const root = mergeApprovalsRoot(normalizedRoot, options);
+    assertHumanInLoopWired(root, options.humanInLoop);
     if (hasMcpProxyConfig(root)) {
       await (await importOptionalModule(optionalModulePaths.mcpProxy)).resolveMcpProxies(root, { projectRoot: options.projectRoot });
     }
     const casing = options.casing ?? "kebab";
     const services = options.services ?? {};
-    const runtimeOptions = options.humanInLoop ?? {};
+    const humanInLoop = options.humanInLoop;
     const runtimeFetch = options.fetch ?? globalThis.fetch;
     version = options.version ?? findEntrypointPackageMetadata(argv[1])?.version;
     const servicesWithBuiltIns = {
       ...services,
-      runtimeOptions,
+      humanInLoop,
       root
     };
     const requirementOptions = {
@@ -9158,10 +9282,11 @@ async function runCLI(roots, options = {}) {
         servicesWithBuiltIns,
         requirementOptions,
         runtimeFetch,
-        runtimeOptions,
+        humanInLoop,
         options.env,
         options.fs,
         options.outputEmitter,
+        controls.outputFormats,
         {
           input: options.promptInput,
           output: options.promptOutput
@@ -9235,7 +9360,7 @@ async function runCLI(roots, options = {}) {
     }
     await handleRunError(error3, {
       debugStackMode: resolvedFlags !== void 0 ? resolveDebugStackMode(resolvedFlags.debug) : getDebugStackModeFromArgv(argv),
-      output: resolvedFlags !== void 0 ? resolveOutput(resolvedFlags) : resolveOutputFromArgv(argv),
+      output: resolvedFlags !== void 0 ? resolveOutput(resolvedFlags) : resolveOutputFromArgv(argv, controls.outputFormats),
       verbose: resolvedFlags ? Boolean(resolvedFlags.verbose) : argv.includes("--verbose"),
       program,
       argv,
@@ -14645,7 +14770,7 @@ function sleep2(ms) {
 // src/cli.ts
 configureTheme({ brand: "green", label: "Terminal Pilot" });
 function getBundledPackageVersion() {
-  return true ? "0.0.45" : void 0;
+  return true ? "0.0.47" : void 0;
 }
 function normalizeArgv(argv) {
   if (argv.includes("--json") && !argv.some((argument) => argument === "--output" || argument.startsWith("--output="))) {