toolcraft 0.0.52 → 0.0.54

package/dist/cli.js

@@ -735,6 +735,14 @@ function isNodeVisibleInScope(node, scope) {
 function getVisibleChildren(group, scope) {
     return group.children.filter((child) => isNodeVisibleInScope(child, scope));
 }
+function getHelpChildren(group, scope) {
+    return getVisibleChildren(group, scope).filter((child) => {
+        if (child.kind === "command") {
+            return child.hidden !== true;
+        }
+        return true;
+    });
+}
 function findVisibleChild(group, token, scope) {
     return getVisibleChildren(group, scope).find((child) => child.name === token || child.aliases.includes(token));
 }
@@ -879,6 +887,31 @@ function describeHelpValueToken(schema, field) {
     }
     return describeFieldNameValueToken(field.displayPath, field.optionFlag) ?? "value";
 }
+function formatCompactEnumSignatureToken(schema) {
+    if (schema.kind !== "enum" || schema.values.length < 2 || schema.values.length > 3) {
+        return undefined;
+    }
+    const tokens = schema.values.map((value) => String(value));
+    const compact = tokens.every((token) => token.length > 0 &&
+        token.length <= 24 &&
+        token.trim() === token &&
+        !token.includes("|") &&
+        !token.includes("\t") &&
+        !token.includes("\n") &&
+        !token.includes("\r") &&
+        !token.includes(" "));
+    return compact ? tokens.join("|") : undefined;
+}
+function formatCommandParameterFieldFlags(field, globalLongOptionFlags) {
+    if (field.positionalIndex !== undefined || field.schema.kind === "boolean") {
+        return formatHelpFieldFlags(field, globalLongOptionFlags);
+    }
+    const enumToken = formatCompactEnumSignatureToken(field.schema);
+    if (enumToken !== undefined) {
+        return `${formatOptionFlags(field, globalLongOptionFlags)} ${enumToken}`;
+    }
+    return formatHelpFieldFlags(field, globalLongOptionFlags);
+}
 function describeDynamicFieldType(field) {
     if (field.schema.kind === "record") {
         const valueSchema = unwrapOptional(field.schema.value);
@@ -1027,7 +1060,7 @@ function formatCommandParameterTokens(command, casing, globalLongOptionFlags) {
     const fields = assignPositionals(collected.fields, command.positional);
     return fields
         .filter((field) => field.global !== true)
-        .map((field) => wrapOptionalCommandParameterToken(formatHelpFieldFlags(field, globalLongOptionFlags), field.positionalIndex === undefined && (field.optional || field.hasDefault)))
+        .map((field) => wrapOptionalCommandParameterToken(formatCommandParameterFieldFlags(field, globalLongOptionFlags), field.positionalIndex === undefined && (field.optional || field.hasDefault)))
         .concat(collected.dynamicFields.flatMap((field) => formatCommandDynamicParameterTokens(field, casing)));
 }
 function formatCommandRowName(node, casing, globalLongOptionFlags) {
@@ -1039,7 +1072,7 @@ function formatCommandRowName(node, casing, globalLongOptionFlags) {
     return name;
 }
 function formatCommandRows(group, scope, casing, globalLongOptionFlags) {
-    return getVisibleChildren(group, scope).map((child) => ({
+    return getHelpChildren(group, scope).map((child) => ({
         name: formatCommandRowName(child, casing, globalLongOptionFlags),
         description: child.description ?? ""
     }));
@@ -1083,7 +1116,7 @@ function collectSchemaGlobalFieldRows(group, scope, casing, globalLongOptionFlag
             }
             return;
         }
-        for (const child of getVisibleChildren(node, scope)) {
+        for (const child of getHelpChildren(node, scope)) {
             visit(child);
         }
     };
@@ -1110,6 +1143,15 @@ function buildUsageLine(breadcrumb, rootUsageName, suffix) {
     const tokens = [rootUsageName, subPath, suffix].filter((segment) => segment.length > 0);
     return tokens.join(" ");
 }
+function formatGroupUsageSuffix(group, scope, casing, globalLongOptionFlags) {
+    if (group.default !== undefined &&
+        group.default.hidden === true &&
+        group.default.scope.includes(scope)) {
+        const parameterTokens = formatCommandParameterTokens(group.default, casing, globalLongOptionFlags);
+        return ["[command]", "[OPTIONS]", ...parameterTokens].join(" ");
+    }
+    return "[command] [OPTIONS]";
+}
 function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUsageName, isRoot) {
     const sections = [];
     const globalLongOptionFlags = getGlobalLongOptionFlags(globalOptions.presetsEnabled, globalOptions.showVersion, globalOptions.controls);
@@ -1130,7 +1172,7 @@ function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUs
     return renderHelpDocument({
         breadcrumb,
         rootUsageName,
-        usageLine: buildUsageLine(breadcrumb, rootUsageName, "[command] [OPTIONS]"),
+        usageLine: buildUsageLine(breadcrumb, rootUsageName, formatGroupUsageSuffix(group, scope, casing, globalLongOptionFlags)),
         description: group.description,
         requiresAuth: group.requires?.auth === true,
         sections
@@ -1220,6 +1262,8 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
             return null;
         }
         const command = new CommanderCommand(node.name);
+        Reflect.set(command, "_toolcraftHidden", node.hidden);
+        Reflect.set(command, "_toolcraftOriginalName", node.name);
         const collected = collectFields(node.params, casing, globalLongOptionFlags);
         const fields = assignPositionals(collected.fields, node.positional);
         validateUniqueOptionFlags(fields, globalLongOptionFlags);
@@ -1263,10 +1307,14 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
     if (!isNodeVisibleInScope(node, "cli")) {
         return null;
     }
+    const reservedChildNames = node.children
+        .filter((child) => !isNodeVisibleInScope(child, "cli"))
+        .flatMap((child) => getNodeCommandNames(child));
     const visibleChildren = node.children
         .map((child) => createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled, controls, nextPathSegments))
         .filter((child) => child !== null);
     const group = new CommanderCommand(node.name);
+    Reflect.set(group, "_toolcraftReservedChildNames", reservedChildNames);
     if (node.description !== undefined) {
         group.description(node.description);
     }
@@ -1283,7 +1331,7 @@ function createNodeCommand(node, casing, globalLongOptionFlags, execute, presets
     return group;
 }
 function addCommanderChild(parent, child, isDefault, siblingNames) {
-    if (isDefault && child.name().length === 0) {
+    if (isDefault && (child.name().length === 0 || isToolcraftHiddenCommander(child))) {
         let internalName = "__toolcraft_default__";
         let suffix = 2;
         while (siblingNames.has(internalName)) {
@@ -1291,10 +1339,33 @@ function addCommanderChild(parent, child, isDefault, siblingNames) {
             suffix += 1;
         }
         child.name(internalName);
+        Reflect.set(parent, "_toolcraftHiddenDefaultNames", getToolcraftHiddenDefaultNames(parent).concat([
+            ...new Set([Reflect.get(child, "_toolcraftOriginalName"), ...child.aliases()].filter((name) => typeof name === "string" && name.length > 0))
+        ]));
         parent.addCommand(child, { hidden: true, isDefault: true });
         return;
     }
-    parent.addCommand(child, isDefault ? { isDefault: true } : undefined);
+    const options = {
+        ...(isDefault ? { isDefault: true } : {}),
+        ...(isToolcraftHiddenCommander(child) ? { hidden: true } : {})
+    };
+    parent.addCommand(child, Object.keys(options).length > 0 ? options : undefined);
+}
+function isToolcraftHiddenCommander(command) {
+    return Reflect.get(command, "_toolcraftHidden") === true;
+}
+function getToolcraftHiddenDefaultNames(command) {
+    const value = Reflect.get(command, "_toolcraftHiddenDefaultNames");
+    return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+function getToolcraftReservedChildNames(command) {
+    const value = Reflect.get(command, "_toolcraftReservedChildNames");
+    return Array.isArray(value)
+        ? value.filter((item) => typeof item === "string")
+        : [];
+}
+function getNodeCommandNames(node) {
+    return [node.name, ...node.aliases].filter((name) => name.length > 0);
 }
 function addGlobalOptions(command, presetsEnabled, controls) {
     const options = [];
@@ -3003,6 +3074,14 @@ function findUnknownCommanderCommand(program, argv) {
             }
             continue;
         }
+        if (getToolcraftHiddenDefaultNames(current).includes(token) ||
+            getToolcraftReservedChildNames(current).includes(token)) {
+            return {
+                input: token,
+                currentCommand: current,
+                commandPath: pathSegments.join(" ")
+            };
+        }
         if (current.commands.length === 0 || getDefaultCommanderCommandName(current) !== undefined) {
             return undefined;
         }
@@ -3073,6 +3152,9 @@ export async function runCLI(roots, options = {}) {
     if (version !== undefined) {
         program.version(version, "--version");
     }
+    Reflect.set(program, "_toolcraftReservedChildNames", root.children
+        .filter((child) => !isNodeVisibleInScope(child, "cli"))
+        .flatMap((child) => getNodeCommandNames(child)));
     let lastActionCommand;
     let resolvedCommandPath = "";
     let errorReportContext;

package/dist/index.d.ts

@@ -99,6 +99,7 @@ export type HandlerContext<TParamsSchema extends ObjectSchema<any> = AnyObjectSc
 export interface CommandConfig<TServices extends object, TParamsSchema extends ObjectSchema<any>, TSecrets extends SecretDeclarations | undefined, TResult> {
     name: string;
     description?: string;
+    hidden?: boolean;
     examples?: CommandExample[];
     aliases?: string[];
     positional?: string[];
@@ -116,6 +117,7 @@ export interface Command<TServices extends object = EmptyServices, TParamsSchema
     kind: "command";
     name: string;
     description?: string;
+    hidden: boolean;
     examples: CommandExample[];
     aliases: string[];
     positional: string[];

package/dist/index.js

@@ -292,6 +292,7 @@ function createBaseCommand(config) {
         kind: "command",
         name: config.name,
         description: config.description,
+        hidden: config.hidden ?? false,
         examples: cloneCommandExamples(config.examples),
         aliases: [...(config.aliases ?? [])],
         positional: [...(config.positional ?? [])],
@@ -308,6 +309,7 @@ function createBaseCommand(config) {
     Object.defineProperty(command, commandConfigSymbol, {
         value: {
             scope: cloneScope(config.scope),
+            hidden: config.hidden ?? false,
             examples: cloneCommandExamples(config.examples),
             result: config.result,
             humanInLoop: config.humanInLoop,
@@ -358,6 +360,7 @@ function materializeCommand(command, inherited) {
         kind: "command",
         name: command.name,
         description: command.description,
+        hidden: internal.hidden,
         examples: cloneCommandExamples(internal.examples),
         aliases: [...command.aliases],
         positional: [...command.positional],
@@ -374,6 +377,7 @@ function materializeCommand(command, inherited) {
     Object.defineProperty(materialized, commandConfigSymbol, {
         value: {
             scope: cloneScope(internal.scope),
+            hidden: internal.hidden,
             examples: cloneCommandExamples(internal.examples),
             result: internal.result,
             humanInLoop: internal.humanInLoop,

package/dist/mcp-proxy.js

@@ -78,6 +78,7 @@ function createProxyCommand(parent, tool, commandName, connection) {
         kind: "command",
         name: commandName,
         description: tool.description,
+        hidden: false,
         examples: [],
         aliases: [],
         positional: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,7 +47,7 @@
     "postpack": "node ../../scripts/manage-bundled-workspace-deps.mjs cleanup . toolcraft-design @poe-code/frontmatter @poe-code/agent-mcp-config @poe-code/agent-human-in-loop @poe-code/task-list @poe-code/agent-defs @poe-code/config-mutations @poe-code/process-runner tiny-mcp-client mcp-oauth auth-store"
   },
   "dependencies": {
-    "toolcraft-schema": "0.0.52",
+    "toolcraft-schema": "0.0.54",
     "commander": "^14.0.3",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",