argsbarg 3.4.2 → 3.6.0

package/src/builtins/completion-zsh.ts

@@ -1,4 +1,4 @@
-import { CliNode, CliRouter, CliOptionKind } from "../types.ts";
+import { CliOptionKind, type CliRouter } from "../types.ts";
 import { collectScopes, type ScopeRec } from "./scopes.ts";
 import {
   escShellSingleQuoted,
@@ -11,22 +11,41 @@ import {
 function emitScopeArraysZsh(ident: string, scopes: ScopeRec[]): string {
   let out = "";
   for (const [i, sc] of scopes.entries()) {
-    out += "typeset -g A_" + ident + "_" + i + "_opts\n";
-    out += "A_" + ident + "_" + i + "_opts=(";
-    out += "'" + escShellSingleQuoted(kHelpLong) + ":" + escShellSingleQuoted("Show help for this command.") + "' '" + escShellSingleQuoted(kHelpShort) + ":" + escShellSingleQuoted("Show help for this command.") + "'";
+    out += `typeset -g A_${ident}_${i}_opts\n`;
+    out += `A_${ident}_${i}_opts=(`;
+    out +=
+      "'" +
+      escShellSingleQuoted(kHelpLong) +
+      ":" +
+      escShellSingleQuoted("Show help for this command.") +
+      "' '" +
+      escShellSingleQuoted(kHelpShort) +
+      ":" +
+      escShellSingleQuoted("Show help for this command.") +
+      "'";
     for (const o of sc.opts) {
-      out += " '" + escShellSingleQuoted("--" + o.name) + ":" + escShellSingleQuoted(o.description) + "'";
+      out +=
+        " '" +
+        escShellSingleQuoted(`--${o.name}`) +
+        ":" +
+        escShellSingleQuoted(o.description) +
+        "'";
       if (o.shortName) {
-        out += " '" + escShellSingleQuoted("-" + o.shortName) + ":" + escShellSingleQuoted(o.description) + "'";
+        out +=
+          " '" +
+          escShellSingleQuoted(`-${o.shortName}`) +
+          ":" +
+          escShellSingleQuoted(o.description) +
+          "'";
       }
     }
     out += ")\n";
-    out += "typeset -g A_" + ident + "_" + i + "_leaf=" + (sc.kids.length === 0 ? "1" : "0") + "\n";
-    out += "typeset -g A_" + ident + "_" + i + "_pos=" + (sc.wantsFiles ? "1" : "0") + "\n";
+    out += `typeset -g A_${ident}_${i}_leaf=${sc.kids.length === 0 ? "1" : "0"}\n`;
+    out += `typeset -g A_${ident}_${i}_pos=${sc.wantsFiles ? "1" : "0"}\n`;
     if (sc.kids.length > 0) {
-      out += "typeset -g A_" + ident + "_" + i + "_cmds=(";
+      out += `typeset -g A_${ident}_${i}_cmds=(`;
       for (const ch of sc.kids) {
-        out += " '" + escShellSingleQuoted(ch.key) + ":" + escShellSingleQuoted(ch.description) + "'";
+        out += ` '${escShellSingleQuoted(ch.key)}:${escShellSingleQuoted(ch.description)}'`;
       }
       out += ")\n";
     }
@@ -36,19 +55,24 @@ function emitScopeArraysZsh(ident: string, scopes: ScopeRec[]): string {
 
 function emitConsumeLongZsh(ident: string, scopes: ScopeRec[]): string {
   let o = "_${ident}_nac_consume_long() {\n".replace("${ident}", ident);
-  o += "  local sid=\"$1\" w=\"$2\" nw=\"$3\"\n";
+  o += '  local sid="$1" w="$2" nw="$3"\n';
   o += "  case $sid in\n";
   for (const [i, sc] of scopes.entries()) {
-    o += "    " + i + ")\n";
+    o += `    ${i})\n`;
     o += "      case $w in\n";
-    o += "        " + kHelpLong + "|${kHelpLong}=*|${kHelpShort}) echo 1 ;;\n".replace(/\$\{kHelpLong\}/g, kHelpLong).replace(/\$\{kHelpShort\}/g, kHelpShort);
+    o +=
+      "        " +
+      kHelpLong +
+      "|${kHelpLong}=*|${kHelpShort}) echo 1 ;;\n"
+        .replace(/\$\{kHelpLong\}/g, kHelpLong)
+        .replace(/\$\{kHelpShort\}/g, kHelpShort);
     for (const op of sc.opts) {
-      const base = "--" + op.name;
+      const base = `--${op.name}`;
       if (op.kind === "presence") {
-        o += "        " + base + "|${base}=*) echo 1 ;;\n".replace(/\$\{base\}/g, base);
+        o += `        ${base}${"|${base}=*) echo 1 ;;\n".replace(/\$\{base\}/g, base)}`;
       } else {
-        o += "        " + base + "=*) echo 1 ;;\n";
-        o += "        " + base + ") echo 2 ;;\n";
+        o += `        ${base}=*) echo 1 ;;\n`;
+        o += `        ${base}) echo 2 ;;\n`;
       }
     }
     o += "        *) echo 0 ;;\n";
@@ -63,10 +87,10 @@ function emitConsumeLongZsh(ident: string, scopes: ScopeRec[]): string {
 
 function emitConsumeShortZsh(ident: string, scopes: ScopeRec[]): string {
   let o = "_${ident}_nac_consume_short() {\n".replace("${ident}", ident);
-  o += "  local sid=\"$1\" w=\"$2\"\n";
+  o += '  local sid="$1" w="$2"\n';
   o += "  case $sid in\n";
   for (const [i, sc] of scopes.entries()) {
-    o += "    " + i + ")\n";
+    o += `    ${i})\n`;
     o += "      local rest=${w#-}\n";
     o += "      local ch\n";
     o += "      local saw=0\n";
@@ -78,16 +102,16 @@ function emitConsumeShortZsh(ident: string, scopes: ScopeRec[]): string {
     for (const op of sc.opts) {
       if (!op.shortName) continue;
       if (op.kind === "presence") {
-        boolChars += op.shortName + "|";
+        boolChars += `${op.shortName}|`;
       } else {
-        o += "          " + op.shortName + ")\n";
+        o += `          ${op.shortName})\n`;
         o += "            if [[ $saw -ne 0 || -n $rest ]]; then echo 0; return; fi\n";
         o += "            echo 2; return ;;\n";
       }
     }
     if (boolChars.length > 0) {
       boolChars = boolChars.slice(0, -1);
-      o += "          " + boolChars + ") ;;\n";
+      o += `          ${boolChars}) ;;\n`;
     }
     o += "          *) echo 0; return ;;\n";
     o += "        esac\n";
@@ -102,18 +126,22 @@ function emitConsumeShortZsh(ident: string, scopes: ScopeRec[]): string {
   return o;
 }
 
-function emitMatchChildZsh(ident: string, scopes: ScopeRec[], pathIndex: Record<string, number>): string {
+function emitMatchChildZsh(
+  ident: string,
+  scopes: ScopeRec[],
+  pathIndex: Record<string, number>,
+): string {
   let o = "_${ident}_nac_match_child() {\n".replace("${ident}", ident);
-  o += "  local sid=\"$1\" w=\"$2\"\n";
+  o += '  local sid="$1" w="$2"\n';
   o += "  case $sid in\n";
   for (const [sid, sc] of scopes.entries()) {
     if (sc.kids.length === 0) continue;
-    o += "    " + sid + ")\n";
+    o += `    ${sid})\n`;
     o += "      case $w in\n";
     for (const ch of sc.kids) {
-      const childPath = sc.path === "" ? ch.key : sc.path + "/" + ch.key;
+      const childPath = sc.path === "" ? ch.key : `${sc.path}/${ch.key}`;
       const cid = pathIndex[childPath] ?? 0;
-      o += "        " + ch.key + ") echo " + cid + "; return 0 ;;\n";
+      o += `        ${ch.key}) echo ${cid}; return 0 ;;\n`;
     }
     o += "      esac\n";
     o += "      ;;\n";
@@ -129,11 +157,14 @@ function emitSimulateZsh(ident: string): string {
   o += "  local i=2 sid=0 w steps next\n";
   o += "  while (( i < CURRENT )); do\n";
   o += "    w=$words[i]\n";
-  o += "    if [[ $w == " + kHelpShort + " || $w == " + kHelpLong + " ]]; then\n";
+  o += `    if [[ $w == ${kHelpShort} || $w == ${kHelpLong} ]]; then\n`;
   o += "      ((i++)); continue\n";
   o += "    fi\n";
   o += "    if [[ $w == --* ]]; then\n";
-  o += "      steps=$(_${ident}_nac_consume_long \"$sid\" \"$w\" \"${words[i+1]}\")\n".replace("${ident}", ident);
+  o += '      steps=$(_${ident}_nac_consume_long "$sid" "$w" "${words[i+1]}")\n'.replace(
+    "${ident}",
+    ident,
+  );
   o += "      case $steps in\n";
   o += "        0) break ;;\n";
   o += "        1) ((i++)) ;;\n";
@@ -143,7 +174,7 @@ function emitSimulateZsh(ident: string): string {
   o += "      continue\n";
   o += "    fi\n";
   o += "    if [[ $w == -* ]]; then\n";
-  o += "      steps=$(_${ident}_nac_consume_short \"$sid\" \"$w\")\n".replace("${ident}", ident);
+  o += '      steps=$(_${ident}_nac_consume_short "$sid" "$w")\n'.replace("${ident}", ident);
   o += "      case $steps in\n";
   o += "        0) break ;;\n";
   o += "        1) ((i++)) ;;\n";
@@ -152,7 +183,7 @@ function emitSimulateZsh(ident: string): string {
   o += "      esac\n";
   o += "      continue\n";
   o += "    fi\n";
-  o += "    next=$(_${ident}_nac_match_child \"$sid\" \"$w\") || break\n".replace("${ident}", ident);
+  o += '    next=$(_${ident}_nac_match_child "$sid" "$w") || break\n'.replace("${ident}", ident);
   o += "    sid=$next\n";
   o += "    ((i++))\n";
   o += "  done\n";
@@ -166,13 +197,15 @@ function emitEnumReplyZsh(ident: string, scopes: ScopeRec[]): string {
   o += "  local sid=$1 prev=$2\n";
   o += "  case $sid in\n";
   for (const [i, sc] of scopes.entries()) {
-    const enumOpts = sc.opts.filter((op) => op.kind === CliOptionKind.Enum && (op.choices?.length ?? 0) > 0);
+    const enumOpts = sc.opts.filter(
+      (op) => op.kind === CliOptionKind.Enum && (op.choices?.length ?? 0) > 0,
+    );
     if (enumOpts.length === 0) continue;
-    o += "    " + i + ")\n";
+    o += `    ${i})\n`;
     o += "      case $prev in\n";
     for (const op of enumOpts) {
       const vals = (op.choices ?? []).map((c) => escShellSingleQuoted(c)).join(" ");
-      o += "        --" + op.name + ") _values " + vals + "; return 0 ;;\n";
+      o += `        --${op.name}) _values ${vals}; return 0 ;;\n`;
     }
     o += "      esac\n";
     o += "      ;;\n";
@@ -186,24 +219,27 @@ function emitEnumReplyZsh(ident: string, scopes: ScopeRec[]): string {
 function emitMainBodyZsh(schema: CliRouter, ident: string): string {
   const main = mainName(schema.key);
   let o = "_${main}() {\n".replace("${main}", main);
-  o += "  local curcontext=\"$curcontext\" ret=1\n";
+  o += '  local curcontext="$curcontext" ret=1\n';
   o += "  _${ident}_nac_simulate\n".replace("${ident}", ident);
   o += "  local sid=$REPLY_SID\n";
-  o += "  if _${ident}_nac_enum_reply \"$sid\" \"$words[CURRENT-1]\"; then return 0; fi\n".replace("${ident}", ident);
+  o += '  if _${ident}_nac_enum_reply "$sid" "$words[CURRENT-1]"; then return 0; fi\n'.replace(
+    "${ident}",
+    ident,
+  );
   o += "  if [[ $PREFIX == -* ]]; then\n";
   o += "    local -a optsarr\n";
-  o += "    local oname=\"A_${ident}_${sid}_opts\"\n".replace("${ident}", ident);
+  o += '    local oname="A_${ident}_${sid}_opts"\n'.replace("${ident}", ident);
   o += "    optsarr=(${(@P)oname})\n";
   o += "    _describe -t options 'option' optsarr && ret=0\n";
   o += "  else\n";
-  o += "    local lname=\"A_${ident}_${sid}_leaf\"\n".replace("${ident}", ident);
+  o += '    local lname="A_${ident}_${sid}_leaf"\n'.replace("${ident}", ident);
   o += "    if [[ ${(P)lname} -eq 0 ]]; then\n";
   o += "      local -a cmdsarr\n";
-  o += "      local cname=\"A_${ident}_${sid}_cmds\"\n".replace("${ident}", ident);
+  o += '      local cname="A_${ident}_${sid}_cmds"\n'.replace("${ident}", ident);
   o += "      cmdsarr=(${(@P)cname})\n";
   o += "      _describe -t commands 'command' cmdsarr && ret=0\n";
   o += "    else\n";
-  o += "      local pname=\"A_${ident}_${sid}_pos\"\n".replace("${ident}", ident);
+  o += '      local pname="A_${ident}_${sid}_pos"\n'.replace("${ident}", ident);
   o += "      if [[ ${(P)pname} -eq 1 ]]; then\n";
   o += "        _files && ret=0\n";
   o += "      fi\n";
@@ -211,7 +247,9 @@ function emitMainBodyZsh(schema: CliRouter, ident: string): string {
   o += "  fi\n";
   o += "  return ret\n";
   o += "}\n\n";
-  o += "compdef _${main} ${schema.key}\n".replace("${main}", main).replace("${schema.key}", schema.key);
+  o += "compdef _${main} ${schema.key}\n"
+    .replace("${main}", main)
+    .replace("${schema.key}", schema.key);
   return o;
 }
 
@@ -224,7 +262,7 @@ export function completionZshScript(schema: CliRouter): string {
     pathIndex[s.path] = i;
   }
 
-  let out = "#compdef " + schema.key + "\n\n";
+  let out = `#compdef ${schema.key}\n\n`;
   out += emitScopeArraysZsh(ident, scopes);
   out += emitConsumeLongZsh(ident, scopes);
   out += emitConsumeShortZsh(ident, scopes);

package/src/builtins/dispatch.ts

@@ -1,20 +1,20 @@
 import { resolveCapabilities } from "../capabilities.ts";
+import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
+import { cliInstall } from "../install/index.ts";
+import { runMcpBundle } from "../mcp/bundle.ts";
+import { cliMcpServeStdio } from "../mcp.ts";
+import type { ParseResult } from "../parse.ts";
+import { ParseKind } from "../parse.ts";
 import type { CliNode, CliProgram, CliRouter } from "../types.ts";
-import { isCliLeaf, isCliRouter } from "../types.ts";
+import { isCliLeaf } from "../types.ts";
 import { completionBashScript } from "./completion-bash.ts";
 import { completionFishScript } from "./completion-fish.ts";
+import { cliBuiltinCompletionGroup as completionGroup } from "./completion-group.ts";
 import { completionZshScript } from "./completion-zsh.ts";
 import { cliBuiltinInstallCommand } from "./install.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
-import { cliBuiltinVersionCommand } from "./version.ts";
-import { cliBuiltinCompletionGroup as completionGroup } from "./completion-group.ts";
 import { cliPresentationRoot } from "./presentation.ts";
-import { runMcpBundle } from "../mcp/bundle.ts";
-import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
-import { cliMcpServeStdio } from "../mcp.ts";
-import { cliInstall } from "../install/index.ts";
-import type { ParseResult } from "../parse.ts";
-import { ParseKind } from "../parse.ts";
+import { cliBuiltinVersionCommand } from "./version.ts";
 
 export interface DispatchBuiltinOpts {
   isLeafCompletionIntercept: boolean;
@@ -61,16 +61,18 @@ export async function dispatchBuiltin(
 
   if (pr.path[0] === "version") {
     if (pr.path.length !== 1) {
-      process.stderr.write("Unknown subcommand: version " + pr.path.slice(1).join(" ") + "\n");
+      process.stderr.write(`Unknown subcommand: version ${pr.path.slice(1).join(" ")}\n`);
       process.exit(1);
     }
-    process.stdout.write(program.version + "\n");
+    process.stdout.write(`${program.version}\n`);
     process.exit(0);
   }
 
   if (pr.path[0] === "mcp") {
     if (!caps.mcp) {
-      process.stderr.write("MCP is not enabled. Set mcpServer: { enabled: true } on the program root.\n");
+      process.stderr.write(
+        "MCP is not enabled. Set mcpServer: { enabled: true } on the program root.\n",
+      );
       process.exit(1);
     }
     const sub = pr.path[1];
@@ -82,22 +84,24 @@ export async function dispatchBuiltin(
       try {
         runMcpBundle(program);
       } catch (err) {
-        process.stderr.write(err instanceof Error ? err.message + "\n" : "mcp bundle failed.\n");
+        process.stderr.write(err instanceof Error ? `${err.message}\n` : "mcp bundle failed.\n");
         process.exit(1);
       }
       process.exit(0);
     }
-    process.stderr.write("Unknown subcommand: mcp " + pr.path.slice(1).join(" ") + "\n");
+    process.stderr.write(`Unknown subcommand: mcp ${pr.path.slice(1).join(" ")}\n`);
     process.exit(1);
   }
 
   if (pr.path[0] === "install") {
     if (!caps.install) {
-      process.stderr.write("install is disabled. Remove install.enabled: false from the program root.\n");
+      process.stderr.write(
+        "install is disabled. Remove install.enabled: false from the program root.\n",
+      );
       process.exit(1);
     }
     if (pr.path.length !== 1) {
-      process.stderr.write("Unknown subcommand: install " + pr.path.slice(1).join(" ") + "\n");
+      process.stderr.write(`Unknown subcommand: install ${pr.path.slice(1).join(" ")}\n`);
       process.exit(1);
     }
     await cliInstall(program, pr.opts);

package/src/builtins/export.ts

@@ -1,12 +1,12 @@
 import { type CliCapabilities, resolveCapabilities } from "../capabilities.ts";
+import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
+import { visibleOptions } from "../hidden.ts";
 import type { CliFallbackMode, CliNode, CliOption, CliPositional, CliProgram } from "../types.ts";
 import { isCliRouter } from "../types.ts";
-import { visibleOptions } from "../hidden.ts";
 import { cliBuiltinCompletionGroup } from "./completion-group.ts";
 import { cliBuiltinInstallCommand } from "./install.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
 import { cliBuiltinVersionCommand } from "./version.ts";
-import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
 
 /** JSON-safe command node (no handlers). */
 export interface CliSchemaExport {
@@ -55,22 +55,31 @@ function exportBuiltinNode(cmd: CliNode): CliSchemaExport | null {
   return out;
 }
 
+function pushExportedBuiltin(builtins: CliSchemaExport[], cmd: CliNode): void {
+  const node = exportBuiltinNode(cmd);
+  if (node) {
+    builtins.push(node);
+  }
+}
+
 /** Built-in subtrees matching help visibility for `--schema` export. */
-export function exportPresentationBuiltins(program: CliProgram, caps?: CliCapabilities): CliSchemaExport[] {
+export function exportPresentationBuiltins(
+  program: CliProgram,
+  caps?: CliCapabilities,
+): CliSchemaExport[] {
   const resolved = caps ?? resolveCapabilities(program);
-  const builtins: CliSchemaExport[] = [
-    exportBuiltinNode(cliBuiltinCompletionGroup(program))!,
-    exportBuiltinNode(cliBuiltinVersionCommand())!,
-  ];
+  const builtins: CliSchemaExport[] = [];
+  pushExportedBuiltin(builtins, cliBuiltinCompletionGroup(program));
+  pushExportedBuiltin(builtins, cliBuiltinVersionCommand());
   if (resolved.install) {
-    builtins.push(exportBuiltinNode(cliBuiltinInstallCommand(program))!);
+    pushExportedBuiltin(builtins, cliBuiltinInstallCommand(program));
   }
   const docsGroup = cliBuiltinDocsGroupIfEnabled(program);
   if (docsGroup) {
-    builtins.push(exportBuiltinNode(docsGroup)!);
+    pushExportedBuiltin(builtins, docsGroup);
   }
   if (resolved.mcp) {
-    builtins.push(exportBuiltinNode(cliBuiltinMcpCommand(program))!);
+    pushExportedBuiltin(builtins, cliBuiltinMcpCommand(program));
   }
   return builtins;
 }

package/src/builtins/index.ts

@@ -1,10 +1,15 @@
 export { completionBashScript } from "./completion-bash.ts";
-export { completionZshScript } from "./completion-zsh.ts";
 export { completionFishScript } from "./completion-fish.ts";
 export { cliBuiltinCompletionGroup } from "./completion-group.ts";
+export { completionZshScript } from "./completion-zsh.ts";
+export { builtinInterceptRoot, dispatchBuiltin } from "./dispatch.ts";
+export { type CliSchemaExport, exportPresentationBuiltins } from "./export.ts";
 export { cliBuiltinInstallCommand, installBuiltinOptions } from "./install.ts";
 export { cliBuiltinMcpCommand } from "./mcp.ts";
-export { cliParseRoot, cliPresentationRoot, parseBuiltins, presentationBuiltins } from "./presentation.ts";
-export { exportPresentationBuiltins, type CliSchemaExport } from "./export.ts";
-export { dispatchBuiltin, builtinInterceptRoot } from "./dispatch.ts";
+export {
+  cliParseRoot,
+  cliPresentationRoot,
+  parseBuiltins,
+  presentationBuiltins,
+} from "./presentation.ts";
 export { collectScopes, type ScopeRec } from "./scopes.ts";

package/src/builtins/install.ts

@@ -1,5 +1,5 @@
 import { resolveCapabilities } from "../capabilities.ts";
-import { CliProgram, CliOption, CliOptionKind, type CliLeaf } from "../types.ts";
+import { type CliLeaf, type CliOption, CliOptionKind, type CliProgram } from "../types.ts";
 
 /** Install command options (dynamic: `--mcp` only when MCP is enabled). */
 export function installBuiltinOptions(root: CliProgram): CliOption[] {
@@ -42,12 +42,14 @@ export function installBuiltinOptions(root: CliProgram): CliOption[] {
     },
     {
       name: "uninstall",
-      description: "Remove installed artifacts (use --all or scoped flags; skips targets not on disk).",
+      description:
+        "Remove installed artifacts (use --all or scoped flags; skips targets not on disk).",
       kind: CliOptionKind.Presence,
     },
     {
       name: "prefix",
-      description: "Install directory for the binary (default ~/.local/bin; overrides INSTALL_PREFIX).",
+      description:
+        "Install directory for the binary (default ~/.local/bin; overrides INSTALL_PREFIX).",
       kind: CliOptionKind.String,
     },
     {
@@ -67,7 +69,8 @@ export function installBuiltinOptions(root: CliProgram): CliOption[] {
     },
     {
       name: "quiet",
-      description: "Suppress informational output (requires --yes, --json, --reinstall, or --update).",
+      description:
+        "Suppress informational output (requires --yes, --json, --reinstall, or --update).",
       kind: CliOptionKind.Presence,
     },
   ];
@@ -103,11 +106,7 @@ export function cliBuiltinInstallCommand(root: CliProgram): CliLeaf {
     `  ${app} install --reinstall`,
   ];
   if (resolveCapabilities(root).update) {
-    notesLines.push(
-      "",
-      "Upgrade to latest release:",
-      `  ${app} install --update`,
-    );
+    notesLines.push("", "Upgrade to latest release:", `  ${app} install --update`);
   }
   notesLines.push(
     "",
@@ -122,7 +121,8 @@ export function cliBuiltinInstallCommand(root: CliProgram): CliLeaf {
   );
   return {
     key: "install",
-    description: "Install the binary, shell completions, agent skills, and MCP config to your user environment.",
+    description:
+      "Install the binary, shell completions, agent skills, and MCP config to your user environment.",
     notes: notesLines.join("\n"),
     options: installBuiltinOptions(root),
     handler: () => {},

package/src/builtins/mcp.ts

@@ -1,6 +1,6 @@
 import { resolveCapabilities } from "../capabilities.ts";
 import { docsEnabled } from "../docs/resolve.ts";
-import { type CliLeaf, type CliProgram, type CliRouter, CliFallbackMode } from "../types.ts";
+import { CliFallbackMode, type CliLeaf, type CliProgram, type CliRouter } from "../types.ts";
 
 /** Built-in `mcp` router: bare `myapp mcp` runs stdio (via hidden `serve` fallback); `mcp bundle` packs `.mcpb`. */
 export function cliBuiltinMcpCommand(program: CliProgram): CliRouter {

package/src/builtins/presentation.ts

@@ -1,20 +1,17 @@
 import type { CliCapabilities } from "../capabilities.ts";
 import { resolveCapabilities } from "../capabilities.ts";
+import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
 import { presentationNode, visibleOptions } from "../hidden.ts";
 import type { CliLeaf, CliNode, CliProgram, CliRouter } from "../types.ts";
-import { isCliLeaf, isCliRouter } from "../types.ts";
+import { isCliLeaf } from "../types.ts";
 import { cliBuiltinCompletionGroup } from "./completion-group.ts";
 import { cliBuiltinInstallCommand } from "./install.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
 import { cliBuiltinVersionCommand } from "./version.ts";
-import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
 
 /** All built-in command nodes for argv parsing (includes hidden builtins). */
 export function parseBuiltins(program: CliProgram, caps: CliCapabilities): CliNode[] {
-  const builtins: CliNode[] = [
-    cliBuiltinCompletionGroup(program),
-    cliBuiltinVersionCommand(),
-  ];
+  const builtins: CliNode[] = [cliBuiltinCompletionGroup(program), cliBuiltinVersionCommand()];
   if (caps.install) {
     builtins.push(cliBuiltinInstallCommand(program));
   }
@@ -98,10 +95,13 @@ export function cliPresentationRoot(program: CliProgram): CliRouter {
 }
 
 /** Root help notes: consumer `program.notes` plus agent discovery when `docs` is enabled. */
-export function presentationRootNotes(program: CliProgram, caps: CliCapabilities): string | undefined {
+export function presentationRootNotes(
+  program: CliProgram,
+  caps: CliCapabilities,
+): string | undefined {
   const parts: string[] = [];
   if ((program.notes ?? "").trim().length > 0) {
-    parts.push(program.notes!.trim());
+    parts.push((program.notes ?? "").trim());
   }
   if (caps.docs) {
     parts.push(`For AI agents: \`${program.key} docs skill\`.`);

package/src/builtins/scopes.ts

@@ -25,7 +25,7 @@ function walkScopes(cmdPath: string, cmd: CliNode, acc: ScopeRec[]): void {
     wantsFiles: hasPositionalArguments(cmd),
   });
   for (const ch of kids) {
-    const nextPath = cmdPath === "" ? ch.key : cmdPath + "/" + ch.key;
+    const nextPath = cmdPath === "" ? ch.key : `${cmdPath}/${ch.key}`;
     walkScopes(nextPath, ch, acc);
   }
 }

package/src/builtins/version.ts

@@ -1,4 +1,4 @@
-import { type CliLeaf } from "../types.ts";
+import type { CliLeaf } from "../types.ts";
 
 /** Top-level `version` built-in (leaf). */
 export function cliBuiltinVersionCommand(): CliLeaf {

package/src/completion.ts

@@ -3,11 +3,11 @@ Re-export shim — completion emitters and built-in trees live in ./builtins/.
 */
 
 export {
-  completionBashScript,
-  completionZshScript,
-  completionFishScript,
-  cliPresentationRoot,
   cliBuiltinCompletionGroup,
   cliBuiltinInstallCommand,
   cliBuiltinMcpCommand,
+  cliPresentationRoot,
+  completionBashScript,
+  completionFishScript,
+  completionZshScript,
 } from "./builtins/index.ts";