terminal-pilot 0.0.47 → 0.0.49

package/dist/cli.js

@@ -1567,26 +1567,68 @@ function splitWords(value) {
   }
   return words;
 }
-function wrapWords(value, width) {
-  const words = splitWords(value);
+function leadingWhitespaceWidth(value) {
+  let index = 0;
+  while (index < value.length && isWhitespace(value[index])) {
+    index += 1;
+  }
+  return { prefix: value.slice(0, index), rest: value.slice(index) };
+}
+function takeVisiblePrefix(value, width) {
+  let visible = 0;
+  let index = 0;
+  while (index < value.length) {
+    const controlEnd = readControlSequence(value, index);
+    if (controlEnd !== void 0) {
+      index = controlEnd;
+      continue;
+    }
+    const segment = graphemeSegmenter.segment(value.slice(index))[Symbol.iterator]().next().value;
+    const cluster = segment?.segment ?? value[index] ?? "";
+    const nextWidth = clusterWidth(cluster);
+    if (visible > 0 && visible + nextWidth > width) {
+      break;
+    }
+    visible += nextWidth;
+    index += cluster.length || 1;
+  }
+  return { prefix: value.slice(0, index), rest: value.slice(index) };
+}
+function wrapWords(value, width, continuationWidth = width) {
+  const { prefix, rest } = leadingWhitespaceWidth(value);
+  const prefixWidth = visibleWidth(prefix);
+  const firstContentWidth = Math.max(1, width - prefixWidth);
+  const words = splitWords(rest);
   if (words.length === 0) {
-    return [""];
+    return [prefix];
   }
   const lines = [];
   let line = "";
+  let isFirstLine = true;
   for (const word of words) {
-    if (!line) {
-      line = word;
-      continue;
-    }
-    if (visibleWidth(line) + 1 + visibleWidth(word) <= width) {
+    const limit = isFirstLine ? firstContentWidth : continuationWidth;
+    if (line && visibleWidth(line) + 1 + visibleWidth(word) <= limit) {
       line += ` ${word}`;
       continue;
     }
-    lines.push(line);
-    line = word;
+    if (line) {
+      lines.push(isFirstLine ? `${prefix}${line}` : line);
+      isFirstLine = false;
+      line = "";
+    }
+    let remaining = word;
+    while (visibleWidth(remaining) > (isFirstLine ? firstContentWidth : continuationWidth)) {
+      const chunk = takeVisiblePrefix(
+        remaining,
+        isFirstLine ? firstContentWidth : continuationWidth
+      );
+      lines.push(isFirstLine ? `${prefix}${chunk.prefix}` : chunk.prefix);
+      isFirstLine = false;
+      remaining = chunk.rest;
+    }
+    line = remaining;
   }
-  lines.push(line);
+  lines.push(isFirstLine ? `${prefix}${line}` : line);
   return lines;
 }
 function validateLayoutValue(value, name) {
@@ -1614,37 +1656,90 @@ function formatColumns(opts) {
   validateLayoutValue(indent, "indent");
   const maxLeftContentWidth = Math.max(...rows.map((row) => visibleWidth(row.left)));
   const leftWidth = clamp(maxLeftContentWidth + gap, minLeftWidth, maxLeftWidth);
-  const rightWidth = Math.max(20, totalWidth - leftWidth - indent);
+  const rightWidth = Math.max(1, totalWidth - leftWidth - indent);
+  const leftWrapWidth = Math.max(1, totalWidth - indent);
   const firstIndent = " ".repeat(indent);
   const continuationIndent = " ".repeat(indent + leftWidth);
   return rows.flatMap((row) => {
+    const leftLeading = leadingWhitespaceWidth(row.left).prefix;
+    const leftHangIndent = " ".repeat(indent + visibleWidth(leftLeading) + 2);
+    const leftLines = wrapWords(
+      row.left,
+      leftWrapWidth,
+      Math.max(1, totalWidth - visibleWidth(leftHangIndent))
+    );
     if (row.right.length === 0) {
-      return [`${firstIndent}${row.left}`];
+      return leftLines.map(
+        (line, index) => index === 0 ? `${firstIndent}${line}` : `${leftHangIndent}${line}`
+      );
     }
     const rightLines = wrapWords(row.right, rightWidth);
-    if (visibleWidth(row.left) >= leftWidth) {
-      return [
-        `${firstIndent}${row.left}`,
-        ...rightLines.map((line) => `${continuationIndent}${line}`)
-      ];
-    }
-    const firstLine = `${firstIndent}${padEndVisible(row.left, leftWidth)}${rightLines[0]}`;
-    const continuationLines = rightLines.slice(1).map((line) => `${continuationIndent}${line}`);
-    return [firstLine, ...continuationLines];
+    const leftFitsInColumn = visibleWidth(row.left) < leftWidth;
+    if (leftFitsInColumn && leftLines.length === 1) {
+      const firstLine = `${firstIndent}${padEndVisible(leftLines[0] ?? "", leftWidth)}${rightLines[0]}`;
+      const continuationLines = rightLines.slice(1).map((line) => `${continuationIndent}${line}`);
+      return [firstLine, ...continuationLines];
+    }
+    const renderedLeft = leftLines.map(
+      (line, index) => index === 0 ? `${firstIndent}${line}` : `${leftHangIndent}${line}`
+    );
+    const renderedRight = rightLines.map((line) => `${continuationIndent}${line}`);
+    return [...renderedLeft, ...renderedRight];
   }).join("\n");
 }
+function styleHelpToken(token) {
+  switch (token.role) {
+    case "command":
+      return text.command(token.text);
+    case "argument":
+      return styleArgumentToken(token.text);
+    case "option":
+      return text.option(token.text);
+    case "dim":
+      return styleDim(token.text);
+    case "literal":
+      return token.text;
+  }
+}
+function styleArgumentToken(content) {
+  const format = resolveOutputFormat();
+  if (format === "markdown" && content.startsWith("<") && content.endsWith(">")) {
+    return text.argument(content.slice(1, -1));
+  }
+  if (format === "json") {
+    return content;
+  }
+  return text.argument(content);
+}
+function styleDim(content) {
+  const format = resolveOutputFormat();
+  if (format === "json" || format === "markdown") {
+    return content;
+  }
+  return typography.dim(content);
+}
+function joinHelpTokens(tokens) {
+  return tokens.map((token) => token.text).join("");
+}
+function renderHelpTokens(tokens) {
+  return tokens.map((token) => styleHelpToken(token)).join("");
+}
 function formatCommandList(commands) {
   return formatColumns({
-    rows: commands.map((cmd) => ({
-      left: text.command(cmd.name),
-      right: cmd.description
-    }))
+    rows: commands.map((cmd) => {
+      const depthPrefix = " ".repeat((cmd.depth ?? 0) * 2);
+      const styledName = cmd.nameTokens !== void 0 && cmd.nameTokens.length > 0 ? renderHelpTokens(cmd.nameTokens) : text.command(cmd.name);
+      return {
+        left: `${depthPrefix}${styledName}`,
+        right: cmd.description
+      };
+    })
   });
 }
 function formatOptionList(options) {
   return formatColumns({
     rows: options.map((opt) => ({
-      left: text.option(opt.flags),
+      left: opt.flagTokens !== void 0 && opt.flagTokens.length > 0 ? renderHelpTokens(opt.flagTokens) : text.option(opt.flags),
       right: opt.description
     }))
   });
@@ -1714,26 +1809,47 @@ function splitWords2(value) {
   }
   return words;
 }
-function wrapWords2(value, width) {
-  const words = splitWords2(value);
+function leadingWhitespace(value) {
+  let index = 0;
+  while (index < value.length && isWhitespace2(value[index])) {
+    index += 1;
+  }
+  return { prefix: value.slice(0, index), rest: value.slice(index) };
+}
+function takePrefix(value, width) {
+  return { prefix: value.slice(0, width), rest: value.slice(width) };
+}
+function wrapWords2(value, width, continuationWidth = width) {
+  const { prefix, rest } = leadingWhitespace(value);
+  const firstContentWidth = Math.max(1, width - prefix.length);
+  const words = splitWords2(rest);
   if (words.length === 0) {
-    return [""];
+    return [prefix];
   }
   const lines = [];
   let line = "";
+  let isFirstLine = true;
   for (const word of words) {
-    if (!line) {
-      line = word;
-      continue;
-    }
-    if (line.length + 1 + word.length <= width) {
+    const limit = isFirstLine ? firstContentWidth : continuationWidth;
+    if (line && line.length + 1 + word.length <= limit) {
       line += ` ${word}`;
       continue;
     }
-    lines.push(line);
-    line = word;
+    if (line) {
+      lines.push(isFirstLine ? `${prefix}${line}` : line);
+      isFirstLine = false;
+      line = "";
+    }
+    let remaining = word;
+    while (remaining.length > (isFirstLine ? firstContentWidth : continuationWidth)) {
+      const chunk = takePrefix(remaining, isFirstLine ? firstContentWidth : continuationWidth);
+      lines.push(isFirstLine ? `${prefix}${chunk.prefix}` : chunk.prefix);
+      isFirstLine = false;
+      remaining = chunk.rest;
+    }
+    line = remaining;
   }
-  lines.push(line);
+  lines.push(isFirstLine ? `${prefix}${line}` : line);
   return lines;
 }
 function formatColumns2(opts) {
@@ -1751,29 +1867,44 @@ function formatColumns2(opts) {
   const indent = opts.indent ?? 2;
   const maxLeftContentWidth = Math.max(...rows.map((row) => row.left.length));
   const leftWidth = clamp2(maxLeftContentWidth + gap, minLeftWidth, maxLeftWidth);
-  const rightWidth = Math.max(20, totalWidth - leftWidth - indent);
+  const rightWidth = Math.max(1, totalWidth - leftWidth - indent);
+  const leftWrapWidth = Math.max(1, totalWidth - indent);
   const firstIndent = " ".repeat(indent);
   const continuationIndent = " ".repeat(indent + leftWidth);
   return rows.flatMap((row) => {
+    let leftLeadingWidth = 0;
+    while (leftLeadingWidth < row.left.length && isWhitespace2(row.left[leftLeadingWidth])) {
+      leftLeadingWidth += 1;
+    }
+    const leftHangIndent = " ".repeat(indent + leftLeadingWidth + 2);
+    const leftLines = wrapWords2(
+      row.left,
+      leftWrapWidth,
+      Math.max(1, totalWidth - leftHangIndent.length)
+    );
     if (row.right.length === 0) {
-      return [`${firstIndent}${row.left}`];
+      return leftLines.map(
+        (line, index) => index === 0 ? `${firstIndent}${line}` : `${leftHangIndent}${line}`
+      );
     }
     const rightLines = wrapWords2(row.right, rightWidth);
-    if (row.left.length >= leftWidth) {
-      return [
-        `${firstIndent}${row.left}`,
-        ...rightLines.map((line) => `${continuationIndent}${line}`)
-      ];
-    }
-    const firstLine = `${firstIndent}${padEndVisible2(row.left, leftWidth)}${rightLines[0]}`;
-    const continuationLines = rightLines.slice(1).map((line) => `${continuationIndent}${line}`);
-    return [firstLine, ...continuationLines];
+    const leftFitsInColumn = row.left.length < leftWidth;
+    if (leftFitsInColumn && leftLines.length === 1) {
+      const firstLine = `${firstIndent}${padEndVisible2(leftLines[0] ?? "", leftWidth)}${rightLines[0]}`;
+      const continuationLines = rightLines.slice(1).map((line) => `${continuationIndent}${line}`);
+      return [firstLine, ...continuationLines];
+    }
+    const renderedLeft = leftLines.map(
+      (line, index) => index === 0 ? `${firstIndent}${line}` : `${leftHangIndent}${line}`
+    );
+    const renderedRight = rightLines.map((line) => `${continuationIndent}${line}`);
+    return [...renderedLeft, ...renderedRight];
   }).join("\n");
 }
 function formatCommandList2(commands) {
   return formatColumns2({
     rows: commands.map((cmd) => ({
-      left: cmd.name,
+      left: `${" ".repeat((cmd.depth ?? 0) * 2)}${cmd.nameTokens !== void 0 && cmd.nameTokens.length > 0 ? joinHelpTokens(cmd.nameTokens) : cmd.name}`,
       right: cmd.description
     }))
   });
@@ -1781,7 +1912,7 @@ function formatCommandList2(commands) {
 function formatOptionList2(options) {
   return formatColumns2({
     rows: options.map((opt) => ({
-      left: opt.flags,
+      left: opt.flagTokens !== void 0 && opt.flagTokens.length > 0 ? joinHelpTokens(opt.flagTokens) : opt.flags,
       right: opt.description
     }))
   });
@@ -1790,6 +1921,7 @@ function formatOptionList2(options) {
 // ../toolcraft-design/src/components/table.ts
 var reset2 = "\x1B[0m";
 var ellipsis = "\u2026";
+var minCellWidth = 4;
 var graphemeSegmenter2 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function getCell(row, name) {
   return Object.prototype.hasOwnProperty.call(row, name) ? row[name] ?? "" : "";
@@ -1923,6 +2055,39 @@ function computeColumns(columns) {
     width: getColumnWidth(column)
   }));
 }
+function frameWidth(columnCount) {
+  return columnCount * 3 + 1;
+}
+function budgetColumns(columns, maxWidth) {
+  if (maxWidth === void 0) {
+    return columns;
+  }
+  const available = maxWidth - frameWidth(columns.length);
+  const contentWidth = (cap2) => columns.reduce((total, column) => total + Math.min(column.width, cap2), 0);
+  if (columns.reduce((total, column) => total + column.width, 0) <= available) {
+    return columns;
+  }
+  let cap = minCellWidth;
+  while (contentWidth(cap + 1) <= available) {
+    cap += 1;
+  }
+  const budgeted = columns.map((column) => ({ ...column, width: Math.min(column.width, cap) }));
+  let slack = available - contentWidth(cap);
+  while (slack > 0) {
+    const growable = budgeted.filter((column, index) => column.width < columns[index].width);
+    if (growable.length === 0) {
+      break;
+    }
+    for (const column of growable) {
+      if (slack === 0) {
+        break;
+      }
+      column.width += 1;
+      slack -= 1;
+    }
+  }
+  return budgeted;
+}
 function renderBorder(columns, theme, parts) {
   const horizontal = theme.muted("\u2500");
   const segments = columns.map((column) => horizontal.repeat(column.width + 2));
@@ -2007,14 +2172,15 @@ function renderTableTerminal(options) {
   }
   const separatorOptions = options;
   const includeRowSeparators = separatorOptions.rowSeparator === true || separatorOptions.rowSeparators === true;
-  const top = renderBorder(computedColumns, theme, { left: "\u250C", mid: "\u252C", right: "\u2510" });
+  const budgetedColumns = budgetColumns(computedColumns, options.maxWidth ?? process.stdout.columns);
+  const top = renderBorder(budgetedColumns, theme, { left: "\u250C", mid: "\u252C", right: "\u2510" });
   const header = renderTerminalRow(
-    computedColumns.map((column) => theme.header(column.title)),
-    computedColumns,
+    budgetedColumns.map((column) => theme.header(column.title)),
+    budgetedColumns,
     theme
   );
-  const headerBottom = renderBorder(computedColumns, theme, { left: "\u251C", mid: "\u253C", right: "\u2524" });
-  const bottom = renderBorder(computedColumns, theme, { left: "\u2514", mid: "\u2534", right: "\u2518" });
+  const headerBottom = renderBorder(budgetedColumns, theme, { left: "\u251C", mid: "\u253C", right: "\u2524" });
+  const bottom = renderBorder(budgetedColumns, theme, { left: "\u2514", mid: "\u2534", right: "\u2518" });
   const renderedRows = [];
   for (const [index, row] of rows.entries()) {
     if (includeRowSeparators && index > 0) {
@@ -2022,8 +2188,8 @@ function renderTableTerminal(options) {
     }
     renderedRows.push(
       renderTerminalRow(
-        computedColumns.map((column) => getCell(row, column.name)),
-        computedColumns,
+        budgetedColumns.map((column) => getCell(row, column.name)),
+        budgetedColumns,
         theme
       )
     );
@@ -2116,6 +2282,19 @@ ${options.theme.muted(options.badges.map((badge) => badge[0] + badge.slice(1).to
 
 // ../toolcraft-design/src/components/template.ts
 var MAX_PARTIAL_DEPTH = 100;
+var MAX_TAG_EXCERPT_LENGTH = 40;
+var TemplateParseError = class extends Error {
+  description;
+  line;
+  column;
+  constructor(description, position) {
+    super(`${description} at line ${position.line}, column ${position.column}`);
+    this.name = "TemplateParseError";
+    this.description = description;
+    this.line = position.line;
+    this.column = position.column;
+  }
+};
 var HTML_ESCAPE = {
   "&": "&amp;",
   "<": "&lt;",
@@ -2222,13 +2401,13 @@ function parseTag(template, open) {
   if (template.startsWith("{{{", open)) {
     const close2 = template.indexOf("}}}", open + 3);
     if (close2 === -1) {
-      throw new Error("Unclosed unescaped tag");
+      throw unclosedTagError(template, open, "}}}");
     }
     return { kind: "unescaped", name: template.slice(open + 3, close2).trim(), end: close2 + 3 };
   }
   const close = template.indexOf("}}", open + 2);
   if (close === -1) {
-    throw new Error("Unclosed tag");
+    throw unclosedTagError(template, open, "}}");
   }
   const raw = template.slice(open + 2, close).trim();
   const sigil = raw[0];
@@ -2243,6 +2422,16 @@ function parseTag(template, open) {
   if (sigil === "=" && raw.endsWith("=")) return { kind: "delimiter", name, end };
   return { kind: "name", name: raw, end };
 }
+function unclosedTagError(template, open, expected) {
+  const before = template.slice(0, open);
+  const lineEnd = template.indexOf("\n", open);
+  const opened = template.slice(open, lineEnd === -1 ? template.length : lineEnd).trimEnd();
+  const tag = opened.length > MAX_TAG_EXCERPT_LENGTH ? `${opened.slice(0, MAX_TAG_EXCERPT_LENGTH)}...` : opened;
+  return new TemplateParseError(`Unclosed tag "${tag}": expected "${expected}"`, {
+    line: before.split("\n").length,
+    column: open - (before.lastIndexOf("\n") + 1) + 1
+  });
+}
 function getStandalone(template, tagStart, tagEnd, kind) {
   if (!["section", "inverted", "close", "comment", "partial", "delimiter"].includes(kind)) {
     return void 0;
@@ -2814,6 +3003,15 @@ var cursor = {
 var erase = {
   down: "\x1B[J"
 };
+function nonTtyPromptMessage(argv = process.argv) {
+  const tokens = [];
+  for (const arg of argv.slice(2)) {
+    if (arg.startsWith("-")) break;
+    tokens.push(arg);
+  }
+  const retry = [...tokens, "--yes"].join(" ");
+  return `Interactive prompt requires a TTY. Re-run with \`${retry}\` to accept defaults non-interactively, or set POE_NO_PROMPT=1 in CI.`;
+}
 var Prompt = class extends EventEmitter {
   state = "initial";
   value;
@@ -2884,7 +3082,7 @@ var Prompt = class extends EventEmitter {
     });
   }
   promptNonTty() {
-    return Promise.reject(new Error("Interactive prompt requires a TTY. Set POE_NO_PROMPT=1 to accept defaults non-interactively."));
+    return Promise.reject(new Error(nonTtyPromptMessage()));
   }
   readNonTtyLine() {
     return new Promise((resolve) => {
@@ -3408,6 +3606,9 @@ var UserError = class extends Error {
     this.name = "UserError";
   }
 };
+function isUserError(error3) {
+  return error3 instanceof UserError || error3 instanceof Error && error3.name === "UserError";
+}
 var ToolcraftBugError = class extends Error {
   constructor(message2) {
     super(message2);
@@ -5049,6 +5250,9 @@ function compactUrl(value) {
     return value;
   }
 }
+function stackedList(value) {
+  return value.map((entry) => displayScalar(entry)).join("\n") || "\u2014";
+}
 function displayRowValue(value) {
   return isUrl(value) ? compactUrl(value) : displayScalar(value);
 }
@@ -5074,7 +5278,7 @@ function renderObjectCard(result, primitives, title) {
   const scalarRows = directScalarRows(result);
   const nestedSections = directObjectSections(result);
   const arrayObjectSections = directArrayObjectSections(result);
-  const listRows = Object.entries(result).filter(([, value]) => Array.isArray(value) && !isNonEmptyArrayOfObjects(value)).map(([key, value]) => ({ label: humanizeKey(key), value: displayScalar(value) }));
+  const listRows = Object.entries(result).filter(([, value]) => Array.isArray(value) && !isNonEmptyArrayOfObjects(value)).map(([key, value]) => ({ label: humanizeKey(key), value: stackedList(value) }));
   return renderDetailCard({
     theme: primitives.getTheme(),
     title,
@@ -5776,6 +5980,13 @@ function formatOptionFlags(field, globalLongOptionFlags) {
   }
   return [`-${field.shortFlag}`, field.optionFlag, ...field.longAliases].join(", ");
 }
+function formatMissingParameterMessage(field) {
+  const message2 = `Missing required parameter "${field.displayPath}".`;
+  if (field.schema.kind !== "enum") {
+    return message2;
+  }
+  return `${message2} Expected one of: ${field.schema.values.map((value) => String(value)).join(", ")}.`;
+}
 function formatPositionalToken(field) {
   const optionalPositional = field.optional || field.hasDefault;
   if (field.variadicPosition === true) {
@@ -6062,6 +6273,7 @@ function resolveCLIControls(controls) {
   validateOutputFormats(outputFormats);
   return {
     debug: controls?.debug === true,
+    help: controls?.help === "concise" ? "concise" : "extended",
     logLevel: controls?.logLevel === true,
     output: controls?.output === true || typeof controls?.output === "object",
     outputFormats,
@@ -6256,12 +6468,31 @@ function appendHelpMetadata(description, metadata) {
     return description;
   }
   if (description.length === 0) {
-    return `(${metadata.join(", ")})`;
+    return metadata.map((entry) => `(${entry})`).join(" ");
   }
-  return `${description} (${metadata.join(", ")})`;
+  return `${description} ${metadata.map((entry) => `(${entry})`).join(" ")}`;
+}
+function normalizeHelpEchoKey(value) {
+  let normalized = "";
+  for (const character of value.trim().toLowerCase()) {
+    if (character !== " " && character !== "	" && character !== "\n" && character !== "\r" && character !== "_" && character !== "." && character !== "-") {
+      normalized += character;
+    }
+  }
+  return normalized;
+}
+function isEchoHelpDescription(description, name) {
+  if (description.length === 0) {
+    return false;
+  }
+  return normalizeHelpEchoKey(description) === normalizeHelpEchoKey(name);
+}
+function suppressEchoHelpDescription(description, name) {
+  return isEchoHelpDescription(description, name) ? "" : description;
 }
 function formatHelpFieldDescription(field) {
-  const description = field.description ?? field.displayPath;
+  const rawDescription = field.description ?? field.displayPath;
+  const description = suppressEchoHelpDescription(rawDescription, field.displayPath);
   const metadata = [];
   if (field.schema.kind === "enum" && field.schema.values.length <= 8) {
     const values = field.schema.values.map((value) => String(value)).join(", ");
@@ -6410,13 +6641,21 @@ function formatDynamicHelpMetadata(field) {
   }
   return metadata;
 }
+function createHelpOptionRow(flags, description) {
+  return {
+    flags,
+    flagTokens: tokenizeHelpFlags(flags),
+    description
+  };
+}
 function collectDynamicObjectHelpRows(schema, casing, optionPrefix, displayPrefix, metadata) {
   const rows = [];
   for (const [key, rawChildSchema] of Object.entries(schema.shape)) {
     const childSchema = unwrapOptional2(rawChildSchema);
     const optionFlag = `${optionPrefix}.${formatSegment(key, casing)}`;
     const displayPath = `${displayPrefix}.${key}`;
-    const description = childSchema.description ?? displayPath;
+    const rawDescription = childSchema.description ?? displayPath;
+    const description = suppressEchoHelpDescription(rawDescription, displayPath);
     if (childSchema.kind === "object") {
       rows.push(
         ...collectDynamicObjectHelpRows(childSchema, casing, optionFlag, displayPath, metadata)
@@ -6424,24 +6663,26 @@ function collectDynamicObjectHelpRows(schema, casing, optionPrefix, displayPrefi
       continue;
     }
     if (childSchema.kind === "record") {
-      rows.push({
-        flags: `${optionFlag}.<key> <${describeDynamicFieldType({
-          ...{
-            id: displayPath,
-            path: [],
-            displayPath,
-            optionPath: [],
-            optionPathDisplay: `${displayPath}.<key>`,
-            optionFlag: `${optionFlag}.<key>`,
-            optional: false,
-            hasDefault: false,
-            defaultValue: void 0,
-            requiredWhenActive: false,
-            schema: childSchema
-          }
-        })}>`,
-        description: appendHelpMetadata(description, metadata)
-      });
+      rows.push(
+        createHelpOptionRow(
+          `${optionFlag}.<key> <${describeDynamicFieldType({
+            ...{
+              id: displayPath,
+              path: [],
+              displayPath,
+              optionPath: [],
+              optionPathDisplay: `${displayPath}.<key>`,
+              optionFlag: `${optionFlag}.<key>`,
+              optional: false,
+              hasDefault: false,
+              defaultValue: void 0,
+              requiredWhenActive: false,
+              schema: childSchema
+            }
+          })}>`,
+          appendHelpMetadata(description, metadata)
+        )
+      );
       continue;
     }
     if (childSchema.kind === "array" && unwrapOptional2(childSchema.item).kind === "object") {
@@ -6456,13 +6697,15 @@ function collectDynamicObjectHelpRows(schema, casing, optionPrefix, displayPrefi
       );
       continue;
     }
-    rows.push({
-      flags: childSchema.kind === "boolean" ? childSchema.default === true ? `--no-${optionFlag.slice(2)}` : optionFlag : `${optionFlag} <${describeHelpValueToken(childSchema, {
-        displayPath,
-        optionFlag
-      })}>`,
-      description: appendHelpMetadata(description, metadata)
-    });
+    rows.push(
+      createHelpOptionRow(
+        childSchema.kind === "boolean" ? childSchema.default === true ? `--no-${optionFlag.slice(2)}` : optionFlag : `${optionFlag} <${describeHelpValueToken(childSchema, {
+          displayPath,
+          optionFlag
+        })}>`,
+        appendHelpMetadata(description, metadata)
+      )
+    );
   }
   return rows;
 }
@@ -6493,17 +6736,22 @@ function formatDynamicHelpFields(field, casing) {
     }
   }
   return [
-    {
-      flags: `${field.optionFlag} <${describeDynamicFieldType(field)}>`,
-      description: appendHelpMetadata(field.description ?? field.optionPathDisplay, metadata)
-    }
+    createHelpOptionRow(
+      `${field.optionFlag} <${describeDynamicFieldType(field)}>`,
+      appendHelpMetadata(
+        suppressEchoHelpDescription(
+          field.description ?? field.optionPathDisplay,
+          field.optionPathDisplay
+        ),
+        metadata
+      )
+    )
   ];
 }
 function formatSecretRows(secrets) {
-  return Object.values(secrets).map((secret) => ({
-    flags: secret.env,
-    description: formatSecretDescription(secret)
-  }));
+  return Object.values(secrets).map(
+    (secret) => createHelpOptionRow(secret.env, formatSecretDescription(secret))
+  );
 }
 function formatSecretDescription(secret) {
   if (secret.description !== void 0 && secret.description.length > 0) {
@@ -6531,20 +6779,82 @@ function formatExampleRows(examples, breadcrumb, rootUsageName) {
   ${formatExampleCommand(breadcrumb, rootUsageName, example.params)}`
   );
 }
-function wrapOptionalCommandParameterToken(token, optional) {
-  return optional ? `[${token}]` : token;
+var MAX_INLINE_OPTIONAL_PARAMETER_TOKENS = 8;
+var DEFAULT_HELP_TOTAL_WIDTH = 100;
+function tokenizeHelpFlags(flags) {
+  const tokens = [];
+  let index = 0;
+  while (index < flags.length) {
+    if (flags[index] === " ") {
+      let end2 = index + 1;
+      while (end2 < flags.length && flags[end2] === " ") {
+        end2 += 1;
+      }
+      tokens.push({ text: flags.slice(index, end2), role: "literal" });
+      index = end2;
+      continue;
+    }
+    if (flags[index] === "[" || flags[index] === "]") {
+      tokens.push({ text: flags[index], role: "dim" });
+      index += 1;
+      continue;
+    }
+    if (flags[index] === "<") {
+      const close = flags.indexOf(">", index);
+      if (close === -1) {
+        tokens.push({ text: flags.slice(index), role: "literal" });
+        break;
+      }
+      tokens.push({ text: flags.slice(index, close + 1), role: "argument" });
+      index = close + 1;
+      continue;
+    }
+    if (flags.startsWith("--", index) || flags[index] === "-" && flags[index + 1] !== void 0 && flags[index + 1] !== "-") {
+      let end2 = index + 1;
+      while (end2 < flags.length && flags[end2] !== " " && flags[end2] !== "[" && flags[end2] !== "]" && flags[end2] !== "<") {
+        end2 += 1;
+      }
+      tokens.push({ text: flags.slice(index, end2), role: "option" });
+      index = end2;
+      continue;
+    }
+    let end = index + 1;
+    while (end < flags.length && flags[end] !== " " && flags[end] !== "[" && flags[end] !== "]" && flags[end] !== "<") {
+      end += 1;
+    }
+    const piece = flags.slice(index, end);
+    tokens.push({
+      text: piece,
+      role: piece.includes("|") ? "literal" : piece.startsWith("+") ? "dim" : "literal"
+    });
+    index = end;
+  }
+  return tokens;
+}
+function wrapOptionalParameterTokens(tokens, optional) {
+  if (!optional) {
+    return tokens;
+  }
+  return [{ text: "[", role: "dim" }, ...tokens, { text: "]", role: "dim" }];
+}
+function createCommandParameterToken(text3, optional) {
+  return {
+    text: optional ? `[${text3}]` : text3,
+    optional,
+    tokens: wrapOptionalParameterTokens(tokenizeHelpFlags(text3), optional)
+  };
 }
 function formatCommandDynamicParameterTokens(field, casing) {
   const optional = field.optional || field.hasDefault;
   return formatDynamicHelpFields(field, casing).map(
-    (row) => wrapOptionalCommandParameterToken(row.flags, optional)
+    (row) => createCommandParameterToken(row.flags, optional)
   );
 }
 function formatCommandParameterTokens(command, casing, globalLongOptionFlags) {
   const collected = collectFields(command.params, casing, globalLongOptionFlags);
   const fields = assignPositionals(collected.fields, command.positional);
   return fields.filter((field) => field.global !== true).map(
-    (field) => wrapOptionalCommandParameterToken(
+    (field) => createCommandParameterToken(
       formatCommandParameterFieldFlags(field, globalLongOptionFlags),
       field.positionalIndex === void 0 && (field.optional || field.hasDefault)
     )
@@ -6552,17 +6862,72 @@ function formatCommandParameterTokens(command, casing, globalLongOptionFlags) {
     collected.dynamicFields.flatMap((field) => formatCommandDynamicParameterTokens(field, casing))
   );
 }
-function formatCommandRowName(node, casing, globalLongOptionFlags) {
+function collapseOptionalParameterTokens(parameterTokens, inlineWidthBudget = Number.POSITIVE_INFINITY) {
+  const optionalCount = parameterTokens.filter((token) => token.optional).length;
+  if (optionalCount === 0) {
+    return parameterTokens;
+  }
+  const inlineWidth = parameterTokens.reduce((total, token) => total + token.text.length + 1, 0);
+  if (optionalCount <= MAX_INLINE_OPTIONAL_PARAMETER_TOKENS && inlineWidth <= inlineWidthBudget) {
+    return parameterTokens;
+  }
+  const required = parameterTokens.filter((token) => !token.optional);
+  const collapsedText = `+${optionalCount} options`;
+  return [
+    ...required,
+    {
+      text: `[${collapsedText}]`,
+      optional: true,
+      tokens: [
+        { text: "[", role: "dim" },
+        { text: collapsedText, role: "dim" },
+        { text: "]", role: "dim" }
+      ]
+    }
+  ];
+}
+function formatCommandRowNameTokens(node, casing, globalLongOptionFlags) {
   const baseName = node.aliases.length === 0 ? node.name : `${node.name} (${node.aliases.join(", ")})`;
-  const parameterTokens = node.kind === "command" ? formatCommandParameterTokens(node, casing, globalLongOptionFlags) : [];
-  const name = parameterTokens.length === 0 ? baseName : `${baseName} ${parameterTokens.join(" ")}`;
-  return name;
-}
-function formatCommandRows(group, scope, casing, globalLongOptionFlags) {
-  return getHelpChildren(group, scope).map((child) => ({
-    name: formatCommandRowName(child, casing, globalLongOptionFlags),
-    description: child.description ?? ""
-  }));
+  const nameTokens = [{ text: baseName, role: "command" }];
+  const inlineWidthBudget = Math.max(
+    0,
+    (process.stdout.columns ?? DEFAULT_HELP_TOTAL_WIDTH) - 2 - baseName.length
+  );
+  const parameterTokens = node.kind === "command" ? collapseOptionalParameterTokens(
+    formatCommandParameterTokens(node, casing, globalLongOptionFlags),
+    inlineWidthBudget
+  ) : [];
+  for (const token of parameterTokens) {
+    nameTokens.push({ text: " ", role: "literal" }, ...token.tokens);
+  }
+  const name = parameterTokens.length === 0 ? baseName : `${baseName} ${parameterTokens.map((token) => token.text).join(" ")}`;
+  return { name, nameTokens };
+}
+function formatCommandRows(group, scope, casing, globalLongOptionFlags, help) {
+  const toRow = (child, depth) => {
+    const { name, nameTokens } = formatCommandRowNameTokens(child, casing, globalLongOptionFlags);
+    return {
+      name,
+      nameTokens,
+      description: suppressEchoHelpDescription(child.description ?? "", child.name),
+      kind: child.kind,
+      depth
+    };
+  };
+  if (help === "concise") {
+    return getHelpChildren(group, scope).map((child) => toRow(child, 0));
+  }
+  const rows = [];
+  const visit = (node, depth) => {
+    for (const child of getHelpChildren(node, scope)) {
+      rows.push(toRow(child, depth));
+      if (child.kind === "group") {
+        visit(child, depth + 1);
+      }
+    }
+  };
+  visit(group, 0);
+  return rows;
 }
 function formatGlobalOptionsLine(ctx) {
   const flags = [];
@@ -6581,10 +6946,10 @@ function formatGlobalOptionsLine(ctx) {
   if (ctx.showVersion) {
     flags.push("--version");
   }
-  return flags.length > 0 ? `${text.section("Options:")} ${flags.join("  ")}` : "";
+  return flags.length > 0 ? `${text.section("Global Options:")} ${flags.join("  ")}` : "";
 }
 function formatLeafGlobalOptionsLine(ctx) {
-  return ctx.controls.verbose ? `${text.section("Options:")} -v, --verbose` : "";
+  return ctx.controls.verbose ? `${text.section("Global Options:")} -v, --verbose` : "";
 }
 function collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlags) {
   const seen = /* @__PURE__ */ new Map();
@@ -6602,10 +6967,13 @@ function collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlag
         if (seen.has(dedupeKey)) {
           continue;
         }
-        seen.set(dedupeKey, {
-          flags: formatHelpFieldFlags(field, globalLongOptionFlags),
-          description: formatHelpFieldDescription(field)
-        });
+        seen.set(
+          dedupeKey,
+          createHelpOptionRow(
+            formatHelpFieldFlags(field, globalLongOptionFlags),
+            formatHelpFieldDescription(field)
+          )
+        );
       }
       return;
     }
@@ -6625,6 +6993,18 @@ function formatHelpCommandList(rows) {
 function formatHelpOptionList(rows) {
   return process.stdout.isTTY !== true ? help_formatter_plain_exports.formatOptionList(rows) : formatOptionList(rows);
 }
+function sortLeafHelpOptionFields(fields) {
+  const required = [];
+  const optional = [];
+  for (const field of fields) {
+    if (!field.optional && !field.hasDefault) {
+      required.push(field);
+      continue;
+    }
+    optional.push(field);
+  }
+  return [...required, ...optional];
+}
 function buildUsageLine(breadcrumb, rootUsageName, suffix) {
   const visibleBreadcrumb = breadcrumb.filter((segment) => segment.length > 0);
   const usageBreadcrumb = breadcrumb[0] === "" ? [rootUsageName, ...visibleBreadcrumb] : visibleBreadcrumb;
@@ -6634,15 +7014,37 @@ function buildUsageLine(breadcrumb, rootUsageName, suffix) {
 }
 function formatGroupUsageSuffix(group, scope, casing, globalLongOptionFlags) {
   if (group.default !== void 0 && group.default.hidden === true && group.default.scope.includes(scope)) {
-    const parameterTokens = formatCommandParameterTokens(
-      group.default,
-      casing,
-      globalLongOptionFlags
+    const parameterTokens = collapseOptionalParameterTokens(
+      formatCommandParameterTokens(group.default, casing, globalLongOptionFlags)
     );
-    return ["[command]", "[OPTIONS]", ...parameterTokens].join(" ");
+    return ["[command]", "[OPTIONS]", ...parameterTokens.map((token) => token.text)].join(" ");
   }
   return "[command] [OPTIONS]";
 }
+function formatHelpDrillDownFooter(rootUsageName) {
+  return text.muted(`Run ${rootUsageName} <command> --help for full options.`);
+}
+function formatStyledUsageLine(usageLine) {
+  const parts = usageLine.split(" ").filter((part) => part.length > 0);
+  if (parts.length === 0) {
+    return text.usageCommand(usageLine);
+  }
+  const commandEnd = parts.findIndex(
+    (part) => part.startsWith("-") || part.startsWith("[") || part.startsWith("<")
+  );
+  const commandParts = commandEnd === -1 ? parts : parts.slice(0, commandEnd);
+  const argParts = commandEnd === -1 ? [] : parts.slice(commandEnd);
+  const command = commandParts.join(" ");
+  if (argParts.length === 0) {
+    return text.usageCommand(command);
+  }
+  return `${text.usageCommand(command)} ${renderHelpTokens(
+    argParts.flatMap((part, index) => [
+      ...index === 0 ? [] : [{ text: " ", role: "literal" }],
+      ...tokenizeHelpFlags(part)
+    ])
+  )}`;
+}
 function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUsageName, isRoot) {
   const sections = [];
   const globalLongOptionFlags = getGlobalLongOptionFlags(
@@ -6650,9 +7052,15 @@ function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUs
     globalOptions.showVersion,
     globalOptions.controls
   );
-  const commandRows = formatCommandRows(group, scope, casing, globalLongOptionFlags);
+  const commandRows = formatCommandRows(
+    group,
+    scope,
+    casing,
+    globalLongOptionFlags,
+    globalOptions.controls.help
+  );
   if (commandRows.length > 0) {
-    sections.push(`${text.sectionHeader("Commands")}
+    sections.push(`${text.section("Commands:")}
 ${formatHelpCommandList(commandRows)}`);
   }
   if (isRoot) {
@@ -6665,7 +7073,7 @@ ${formatHelpCommandList(commandRows)}`);
     const builtInLine = formatGlobalOptionsLine(globalOptions);
     if (schemaGlobalRows.length > 0) {
       sections.push(
-        `${text.sectionHeader("Options")}
+        `${text.section("Options:")}
 ${formatHelpOptionList(schemaGlobalRows)}
 ${builtInLine}`
       );
@@ -6673,6 +7081,9 @@ ${builtInLine}`
       sections.push(builtInLine);
     }
   }
+  if (commandRows.length > 0) {
+    sections.push(formatHelpDrillDownFooter(rootUsageName));
+  }
   return renderHelpDocument({
     breadcrumb,
     rootUsageName,
@@ -6695,12 +7106,21 @@ function renderLeafHelp(command, breadcrumb, casing, globalOptions, rootUsageNam
   );
   const collected = collectFields(command.params, casing, globalLongOptionFlags);
   const fields = assignPositionals(collected.fields, command.positional);
-  const optionRows = fields.filter((field) => field.global !== true).map((field) => ({
-    flags: formatHelpFieldFlags(field, globalLongOptionFlags),
-    description: formatHelpFieldDescription(field)
-  })).concat(collected.dynamicFields.flatMap((field) => formatDynamicHelpFields(field, casing)));
+  const localFields = fields.filter((field) => field.global !== true);
+  const toHelpRow = (field) => createHelpOptionRow(
+    formatHelpFieldFlags(field, globalLongOptionFlags),
+    formatHelpFieldDescription(field)
+  );
+  const argumentRows = localFields.filter((field) => field.positionalIndex !== void 0).map(toHelpRow);
+  const optionRows = sortLeafHelpOptionFields(
+    localFields.filter((field) => field.positionalIndex === void 0)
+  ).map(toHelpRow).concat(collected.dynamicFields.flatMap((field) => formatDynamicHelpFields(field, casing)));
+  if (argumentRows.length > 0) {
+    sections.push(`${text.section("Arguments:")}
+${formatHelpOptionList(argumentRows)}`);
+  }
   if (optionRows.length > 0) {
-    sections.push(`${text.sectionHeader("Options")}
+    sections.push(`${text.section("Options:")}
 ${formatHelpOptionList(optionRows)}`);
   }
   const builtInLine = formatLeafGlobalOptionsLine(globalOptions);
@@ -6710,13 +7130,13 @@ ${formatHelpOptionList(optionRows)}`);
   const secretRows = formatSecretRows(command.secrets);
   if (secretRows.length > 0) {
     sections.push(
-      `${text.sectionHeader("Secrets (environment)")}
+      `${text.section("Secrets (environment):")}
 ${formatHelpOptionList(secretRows)}`
     );
   }
   if (command.examples.length > 0) {
     sections.push(
-      `${text.sectionHeader("Examples")}
+      `${text.section("Examples:")}
 ${formatExampleRows(command.examples, breadcrumb, rootUsageName).join("\n")}`
     );
   }
@@ -6739,7 +7159,13 @@ function renderJsonHelp(target, root, casing, globalOptions, rootUsageName) {
   );
   const node = target.node;
   if (node.kind === "group") {
-    const commandRows = formatCommandRows(node, "cli", casing, globalLongOptionFlags);
+    const commandRows = formatCommandRows(
+      node,
+      "cli",
+      casing,
+      globalLongOptionFlags,
+      globalOptions.controls.help
+    );
     const isRoot = node === root;
     return `${JSON.stringify(
       {
@@ -6753,7 +7179,12 @@ function renderJsonHelp(target, root, casing, globalOptions, rootUsageName) {
           formatGroupUsageSuffix(node, "cli", casing, globalLongOptionFlags)
         ),
         ...node.description === void 0 ? {} : { description: node.description },
-        commands: commandRows.map((row) => ({ name: row.name, description: row.description })),
+        commands: commandRows.map((row) => ({
+          name: row.name,
+          description: row.description,
+          kind: row.kind,
+          depth: row.depth
+        })),
         options: isRoot ? collectSchemaGlobalFieldRows(node, "cli", casing, globalLongOptionFlags).map((row) => ({
           name: row.flags.split(/[ ,]+/)[0]?.replace(/^--/, "") ?? row.flags,
           flags: row.flags.split(", "),
@@ -6827,7 +7258,7 @@ function renderHelpDocument(input) {
   if (remainingDescription.length > 0) {
     lines.push(remainingDescription, "");
   }
-  lines.push(`Usage: ${text.usageCommand(input.usageLine)}`, "");
+  lines.push(`Usage: ${formatStyledUsageLine(input.usageLine)}`, "");
   if (input.requiresAuth) {
     lines.push("Requires: authentication");
   }
@@ -6911,7 +7342,9 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
     }
     for (const field of fields) {
       if (field.positionalIndex !== void 0) {
-        command.argument(formatPositionalToken(field));
+        command.argument(
+          field.variadicPosition === true ? `[${field.displayPath}...]` : `[${field.displayPath}]`
+        );
         continue;
       }
       for (const option of createOption(field, globalLongOptionFlags)) {
@@ -7746,11 +8179,11 @@ function writeRichHeader(title) {
 function isHumanInLoopPending(result) {
   return typeof result === "object" && result !== null && result.status === "pending-approval" && typeof result.approvalId === "string" && typeof result.message === "string" && typeof result.enqueuedAt === "string";
 }
-function renderHumanInLoopPending(pending) {
+function renderHumanInLoopPending(pending, rootUsageName) {
   process.stdout.write(
     `\u2713 Queued for human approval (id: ${pending.approvalId})
   Message: ${pending.message}
-  Track:   toolcraft approvals show ${pending.approvalId}
+  Track:   ${rootUsageName} approvals show --approval-id ${pending.approvalId}
 `
   );
 }
@@ -7854,7 +8287,7 @@ function parseOptionFieldValue(field, value, errors) {
     }
     return { ok: true, value: parsedValue };
   } catch (error3) {
-    if (error3 instanceof UserError || error3 instanceof InvalidArgumentError) {
+    if (isUserError(error3) || error3 instanceof InvalidArgumentError) {
       errors.push({
         path: field.displayPath,
         message: error3.message
@@ -8436,7 +8869,7 @@ async function resolveParams(fields, dynamicFields, variants, positionalValues,
       }
       errors.push({
         path: field.displayPath,
-        message: `Missing required parameter "${field.displayPath}".`
+        message: formatMissingParameterMessage(field)
       });
       continue;
     }
@@ -8487,7 +8920,7 @@ function getResolvedFlags(command) {
   const flags = command.optsWithGlobals();
   return flags;
 }
-async function executeCommand(state, services, requirementOptions, runtimeFetch, humanInLoop, runtimeEnv, runtimeFs, outputEmitter, outputFormats, promptStreams, diagnosticsOptions, onErrorReportContext) {
+async function executeCommand(state, rootUsageName, services, requirementOptions, runtimeFetch, humanInLoop, runtimeEnv, runtimeFs, outputEmitter, outputFormats, promptStreams, diagnosticsOptions, onErrorReportContext) {
   const logger2 = createLogger(outputEmitter);
   const optionValues = state.actionCommand.optsWithGlobals();
   const resolvedFlags = optionValues;
@@ -8643,7 +9076,7 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
         writeRichHeader(`${state.command.name} (fixture)`);
       }
       if (isHumanInLoopPending(result)) {
-        renderHumanInLoopPending(result);
+        renderHumanInLoopPending(result, rootUsageName);
         return;
       }
       const renderStatus = renderCLIResult(
@@ -8886,7 +9319,7 @@ function renderHttpError(error3, options) {
 async function handleRunError(error3, options) {
   const logger2 = createLogger(options.outputEmitter);
   await withOutputFormat2(options.output, async () => {
-    if (error3 instanceof UserError) {
+    if (isUserError(error3)) {
       renderCliErrorPattern(
         options.userErrorPattern === "definition" ? {
           kind: "definition",
@@ -9202,11 +9635,9 @@ function getDefaultCommanderCommandName(command) {
 function configureCommanderSuggestionOutput(command) {
   command.exitOverride();
   command.configureOutput({
-    outputError: (message2, write2) => {
-      if (message2.includes("unknown command") || message2.includes("unknown option")) {
-        return;
-      }
-      write2(message2);
+    // Every Commander error throws through exitOverride and is rendered once by handleRunError
+    // in the design-system error pattern; writing it here as well double-reports one mistake.
+    outputError: () => {
     }
   });
   command.commands.forEach((child) => configureCommanderSuggestionOutput(child));
@@ -9279,6 +9710,7 @@ async function runCLI(roots, options = {}) {
       resolvedCommandPath = formatCliCommandPath(state.commandPath);
       await executeCommand(
         state,
+        rootUsageName,
         servicesWithBuiltIns,
         requirementOptions,
         runtimeFetch,
@@ -11022,7 +11454,7 @@ var claudeCodeAgent = {
   id: "claude-code",
   name: "claude-code",
   label: "Claude Code",
-  summary: "Configure Claude Code to route through Poe.",
+  summary: "Anthropic's agentic coding tool for the terminal.",
   aliases: ["claude"],
   binaryName: "claude",
   apiShapes: ["anthropic-messages"],
@@ -11032,6 +11464,7 @@ var claudeCodeAgent = {
     }
   },
   configPath: "~/.claude.json",
+  capabilities: ["spawn", "configure", "install", "test", "skill", "mcp"],
   branding: {
     colors: {
       dark: "#C15F3C",
@@ -11052,6 +11485,7 @@ var claudeDesktopAgent = {
     linux: "~/.config/Claude/claude_desktop_config.json",
     win32: "~/AppData/Roaming/Claude/claude_desktop_config.json"
   },
+  capabilities: ["mcp"],
   branding: {
     colors: {
       dark: "#D97757",
@@ -11065,7 +11499,7 @@ var codexAgent = {
   id: "codex",
   name: "codex",
   label: "Codex",
-  summary: "Configure Codex to use Poe as the model provider.",
+  summary: "OpenAI's coding agent for the terminal.",
   binaryName: "codex",
   apiShapes: ["openai-responses"],
   otelCapture: {
@@ -11079,6 +11513,7 @@ var codexAgent = {
     ]
   },
   configPath: "~/.codex/config.toml",
+  capabilities: ["spawn", "configure", "install", "test", "skill", "mcp"],
   branding: {
     colors: {
       dark: "#D5D9DF",
@@ -11096,6 +11531,7 @@ var cursorAgent = {
   summary: "Cursor's CLI coding agent.",
   binaryName: "cursor-agent",
   configPath: "~/.cursor/mcp.json",
+  capabilities: ["spawn", "configure", "install", "test", "skill", "mcp"],
   branding: {
     colors: {
       dark: "#FFFFFF",
@@ -11110,10 +11546,11 @@ var geminiCliAgent = {
   name: "gemini-cli",
   aliases: ["gemini"],
   label: "Gemini CLI",
-  summary: "Configure Google's Gemini CLI to use a compatible Google generations API.",
+  summary: "Google's open-source AI agent for the terminal.",
   binaryName: "gemini",
   configPath: "~/.gemini/settings.json",
   apiShapes: ["google-generations"],
+  capabilities: ["spawn", "configure", "install", "test", "skill"],
   branding: {
     colors: {
       dark: "#8AB4F8",
@@ -11127,7 +11564,7 @@ var openCodeAgent = {
   id: "opencode",
   name: "opencode",
   label: "OpenCode CLI",
-  summary: "Configure OpenCode CLI to use the Poe API.",
+  summary: "Open-source AI coding agent for the terminal.",
   binaryName: "opencode",
   apiShapes: ["openai-chat-completions"],
   otelCapture: {
@@ -11136,6 +11573,7 @@ var openCodeAgent = {
     }
   },
   configPath: "~/.config/opencode/opencode.json",
+  capabilities: ["spawn", "configure", "install", "test", "skill", "mcp"],
   branding: {
     colors: {
       dark: "#4A4F55",
@@ -11149,11 +11587,12 @@ var kimiAgent = {
   id: "kimi",
   name: "kimi",
   label: "Kimi",
-  summary: "Configure Kimi CLI to use Poe API",
+  summary: "Moonshot AI's coding agent for the terminal.",
   aliases: ["kimi-cli"],
   binaryName: "kimi",
   apiShapes: ["openai-chat-completions"],
   configPath: "~/.kimi/mcp.json",
+  capabilities: ["spawn", "configure", "install", "test", "mcp"],
   branding: {
     colors: {
       dark: "#7B68EE",
@@ -11172,6 +11611,7 @@ var gooseAgent = {
   apiShapes: ["openai-chat-completions"],
   otelCapture: {},
   configPath: "~/.config/goose/config.yaml",
+  capabilities: ["spawn", "configure", "install", "test", "skill", "mcp"],
   branding: {
     colors: {
       dark: "#FF6B35",
@@ -11180,6 +11620,23 @@ var gooseAgent = {
   }
 };
 
+// ../agent-defs/src/agents/pi.ts
+var piAgent = {
+  id: "pi",
+  name: "pi",
+  aliases: ["pi-agent"],
+  label: "Pi",
+  summary: "Minimal AI coding agent for the terminal.",
+  binaryName: "pi",
+  capabilities: ["spawn"],
+  branding: {
+    colors: {
+      dark: "#F2F2F2",
+      light: "#242424"
+    }
+  }
+};
+
 // ../agent-defs/src/agents/poe-agent.ts
 var poeAgentAgent = {
   id: "poe-agent",
@@ -11188,6 +11645,7 @@ var poeAgentAgent = {
   summary: "Run one-shot prompts with the built-in Poe agent runtime.",
   apiShapes: ["openai-responses", "openai-chat-completions"],
   configPath: "~/.poe-code/config.json",
+  capabilities: ["configure"],
   branding: {
     colors: {
       dark: "#A465F7",
@@ -11204,6 +11662,9 @@ function freezeAgent(agent) {
   if (agent.apiShapes !== void 0) {
     Object.freeze(agent.apiShapes);
   }
+  if (agent.capabilities !== void 0) {
+    Object.freeze(agent.capabilities);
+  }
   if (agent.otelCapture?.env !== void 0) {
     Object.freeze(agent.otelCapture.env);
   }
@@ -11223,6 +11684,7 @@ var allAgents = Object.freeze([
   freezeAgent(openCodeAgent),
   freezeAgent(kimiAgent),
   freezeAgent(gooseAgent),
+  freezeAgent(piAgent),
   freezeAgent(poeAgentAgent)
 ]);
 var lookup2 = /* @__PURE__ */ new Map();
@@ -11266,7 +11728,8 @@ var agentSkillConfigs = {
   },
   goose: {
     globalSkillDir: "~/.agents/skills",
-    localSkillDir: ".agents/skills"
+    localSkillDir: ".agents/skills",
+    dirNote: "Goose discovers skills from the shared .agents/skills convention, not a goose-specific directory."
   }
 };
 var supportedAgents = Object.freeze(Object.keys(agentSkillConfigs));
@@ -12640,6 +13103,16 @@ async function executeMutation(mutation, context, options) {
   }
 }
 
+// ../user-error/src/index.ts
+var UserError2 = class extends Error {
+  hint;
+  constructor(message2, options) {
+    super(message2, options);
+    this.name = "UserError";
+    this.hint = options?.hint;
+  }
+};
+
 // ../agent-skill-config/src/error-codes.ts
 function hasOwnErrorCode4(error3, code) {
   return error3 instanceof Error && Object.prototype.hasOwnProperty.call(error3, "code") && error3.code === code;
@@ -12691,8 +13164,11 @@ async function installSkill(agentId, skill, options) {
   const skillFilePath = `${skillFolderPath}/SKILL.md`;
   const displayPath = `${scope === "global" ? config2.globalSkillDir : config2.localSkillDir}/${skill.name}/SKILL.md`;
   const absoluteSkillPath = `${scope === "global" ? options.homeDir : options.cwd}/${skillFilePath.slice(2)}`;
-  if (await pathExists2(options.fs, absoluteSkillPath)) {
-    throw new Error(`Skill already exists: ${displayPath}`);
+  if (!options.force && await pathExists2(options.fs, absoluteSkillPath)) {
+    throw new UserError2(
+      `Skill already exists: ${displayPath}
+Re-run with --force to overwrite it, or remove it first.`
+    );
   }
   await runMutations(
     [
@@ -14770,13 +15246,78 @@ function sleep2(ms) {
 // src/cli.ts
 configureTheme({ brand: "green", label: "Terminal Pilot" });
 function getBundledPackageVersion() {
-  return true ? "0.0.47" : void 0;
-}
+  return true ? "0.0.49" : void 0;
+}
+var pilotOptionsWithValues = /* @__PURE__ */ new Set([
+  "--session",
+  "-s",
+  "--cwd",
+  "--cols",
+  "--rows",
+  "--timeout",
+  "-t",
+  "--last",
+  "-n",
+  "--output",
+  "-o",
+  "--scope",
+  "--padding",
+  "-p",
+  "--log-level",
+  "--preset",
+  "--signal"
+]);
 function normalizeArgv(argv) {
-  if (argv.includes("--json") && !argv.some((argument) => argument === "--output" || argument.startsWith("--output="))) {
-    return argv.flatMap((argument) => argument === "--json" ? ["--output", "json"] : [argument]);
+  if (!argv.includes("--json")) {
+    return argv;
+  }
+  if (argv.some((argument) => argument === "--output" || argument.startsWith("--output="))) {
+    return argv;
+  }
+  const normalized = [];
+  let index = 0;
+  let bareTokenCount = 0;
+  let expectOptionValue = false;
+  while (index < argv.length) {
+    const token = argv[index];
+    if (index < 2) {
+      normalized.push(token);
+      index += 1;
+      continue;
+    }
+    if (token === "--") {
+      normalized.push(token, ...argv.slice(index + 1));
+      break;
+    }
+    if (expectOptionValue) {
+      normalized.push(token);
+      expectOptionValue = false;
+      index += 1;
+      continue;
+    }
+    if (token === "--json") {
+      normalized.push("--output", "json");
+      index += 1;
+      continue;
+    }
+    if (token.startsWith("-") && token !== "-") {
+      normalized.push(token);
+      const optionName = token.includes("=") ? token.slice(0, token.indexOf("=")) : token;
+      if (!token.includes("=") && (pilotOptionsWithValues.has(optionName) || optionName === "--debug" && argv[index + 1] !== void 0 && !argv[index + 1].startsWith("-"))) {
+        expectOptionValue = true;
+      }
+      index += 1;
+      continue;
+    }
+    bareTokenCount += 1;
+    if (bareTokenCount >= 2) {
+      normalized.push(...argv.slice(index));
+      break;
+    }
+    normalized.push(token);
+    index += 1;
   }
-  return argv;
+  return normalized;
 }
 async function main(argv = process.argv, options = {}) {
   if (isTerminalPilotDaemonArgv(argv)) {
@@ -14823,6 +15364,7 @@ if (await isDirectExecution(process.argv)) {
   await main();
 }
 export {
-  main
+  main,
+  normalizeArgv
 };
 //# sourceMappingURL=cli.js.map