toolcraft 0.0.85 → 0.0.86

package/dist/cli.d.ts

@@ -1,7 +1,8 @@
+import "./node-require-shim.js";
 import { configureTheme } from "toolcraft-design";
 import type { Group, LogLevel, RuntimeLoggerInput } from "./index.js";
 import { type ErrorReportsOption } from "./error-report.js";
-import type { HumanInLoopRuntimeOptions } from "./human-in-loop/index.js";
+import type { HumanInLoopRuntimeOptions } from "./human-in-loop/types.js";
 export { configureTheme };
 type Casing = "kebab" | "snake";
 export interface CLIControls {

package/dist/cli.js

@@ -1,13 +1,11 @@
+import "./node-require-shim.js";
 import { access, lstat, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { Command as CommanderCommand, CommanderError, InvalidArgumentError, Option } from "commander";
 import { cancel, configureTheme, confirm, createLogger, formatCommandList, formatOptionList, getTheme, helpFormatterPlain, isCancel, note, promptText, renderTable, resetOutputFormatCache, select, text } from "toolcraft-design";
-import { ApprovalDeclinedError, UserError, assertCommandRequirements, getCommandSourcePath, resolveCommandSecrets } from "./index.js";
+import { ApprovalDeclinedError, UserError, assertCommandRequirements, getCommandSourcePath, hasMcpProxyConfig, resolveCommandSecrets } from "./index.js";
 import { hasOwnErrorCode } from "./error-codes.js";
-import { mergeApprovalsGroup } from "./human-in-loop/approvals-commands.js";
 import { writeErrorReport } from "./error-report.js";
-import { invokeWithHumanInLoop } from "./human-in-loop/index.js";
-import { resolveMcpProxies } from "./mcp-proxy.js";
 import { getExpectedNumberDescription, isValidNumberSchemaValue } from "./number-schema.js";
 import { findEntrypointPackageMetadata } from "./package-metadata.js";
 import { redactHttpBody, redactHttpHeaderValue } from "./redaction.js";
@@ -33,6 +31,14 @@ const RESERVED_SERVICE_NAMES = new Set([
 ]);
 const RESERVED_SERVICE_NAMES_MESSAGE = "Available reserved names: params, secrets, fetch, fs, env, diagnostics, progress, runtimeOptions, root.";
 const NULL_OPTION_VALUE = Symbol("toolcraft.cli.null");
+const optionalModulePaths = {
+    approvals: "./human-in-loop/approvals-commands.js",
+    humanInLoop: "./human-in-loop/gate.js",
+    mcpProxy: "./mcp-proxy.js"
+};
+function importOptionalModule(specifier) {
+    return import(specifier);
+}
 function inferProgramName(argv) {
     const entrypoint = argv[1];
     if (typeof entrypoint !== "string" || entrypoint.length === 0) {
@@ -2875,7 +2881,9 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
                     throw new UserError("Operation cancelled.");
                 }
             }
-            const result = await invokeWithHumanInLoop(state.command, context, runtimeOptions, state.commandPath);
+            const result = state.command.humanInLoop
+                ? await (await importOptionalModule(optionalModulePaths.humanInLoop)).invokeWithHumanInLoop(state.command, context, runtimeOptions, state.commandPath)
+                : await state.command.handler(context);
             if (output === "rich" && runtime.isFixture) {
                 writeRichHeader(`${state.command.name} (fixture)`);
             }
@@ -3419,8 +3427,12 @@ export async function runCLI(roots, options = {}) {
     let errorReportContext;
     try {
         const normalizedRoot = normalizeRoots(roots, argv);
-        const root = options.approvals === true ? mergeApprovalsGroup(normalizedRoot) : normalizedRoot;
-        await resolveMcpProxies(root, { projectRoot: options.projectRoot });
+        const root = options.approvals === true
+            ? (await importOptionalModule(optionalModulePaths.approvals)).mergeApprovalsGroup(normalizedRoot)
+            : normalizedRoot;
+        if (hasMcpProxyConfig(root)) {
+            await (await importOptionalModule(optionalModulePaths.mcpProxy)).resolveMcpProxies(root, { projectRoot: options.projectRoot });
+        }
         const casing = options.casing ?? "kebab";
         const services = (options.services ?? {});
         const runtimeOptions = options.humanInLoop ?? {};

package/dist/error-report.js

@@ -4,8 +4,8 @@ import os from "node:os";
 import path from "node:path";
 import { CommanderError } from "commander";
 import { ApprovalDeclinedError } from "./human-in-loop/types.js";
-import { findProjectRoot } from "./mcp-proxy.js";
 import { findPackageMetadata } from "./package-metadata.js";
+import { findProjectRoot } from "./project-root.js";
 import { isSensitiveName, redactHttpBody, redactHttpHeaderValue } from "./redaction.js";
 import { UserError } from "./user-error.js";
 const ERROR_REPORTS_ENV = "TOOLCRAFT_ERROR_REPORTS";

package/dist/index.d.ts

@@ -200,6 +200,7 @@ export declare function defineGroup<TServices extends object = EmptyServices, TN
     humanInLoop?: TOwnHumanInLoop;
 }): Group<TServices> & TypedGroupMetadata<TServices, TName, TChildren, TOwnScope, ResolveOwnHumanInLoopMode<TOwnHumanInLoop>>;
 export declare function getCommandSourcePath(command: Command<any, any, any, any>): string | undefined;
+export declare function hasMcpProxyConfig(group: Group<any>): boolean;
 export { S, toJsonSchema } from "toolcraft-schema";
 export { AuthenticationError, BadRequestError, ClientError, ConflictError, HttpError, InternalServerError, NotFoundError, PermissionDeniedError, RateLimitError, ServerError, ServiceUnavailableError, UnprocessableEntityError, createHttpError } from "./http-errors.js";
 export type { HttpErrorRequest, HttpErrorResponse } from "./http-errors.js";

package/dist/index.js

@@ -469,6 +469,17 @@ export function defineGroup(config) {
 export function getCommandSourcePath(command) {
     return command[commandSourcePathSymbol];
 }
+export function hasMcpProxyConfig(group) {
+    const configSymbol = Object.getOwnPropertySymbols(group).find((candidate) => candidate.description === groupConfigSymbol.description);
+    const config = configSymbol === undefined
+        ? undefined
+        : group[configSymbol];
+    if (config?.mcp !== undefined) {
+        return true;
+    }
+    const children = config?.children ?? group.children;
+    return children.some((child) => child.kind === "group" && hasMcpProxyConfig(child));
+}
 export { S, toJsonSchema } from "toolcraft-schema";
 export { AuthenticationError, BadRequestError, ClientError, ConflictError, HttpError, InternalServerError, NotFoundError, PermissionDeniedError, RateLimitError, ServerError, ServiceUnavailableError, UnprocessableEntityError, createHttpError } from "./http-errors.js";
 export { ApprovalDeclinedError, ToolcraftBugError, UserError };

package/dist/mcp-proxy.d.ts

@@ -1,11 +1,11 @@
 import type { McpServerConfig } from "@poe-code/agent-mcp-config";
 import { McpClient } from "tiny-mcp-client";
 import type { Group } from "./index.js";
+export { findProjectRoot } from "./project-root.js";
 export interface ResolveMcpProxyOptions {
     projectRoot?: string;
 }
 export declare function hasMcpProxyGroups(root: Group<any>): boolean;
-export declare function findProjectRoot(from?: string): string | undefined;
 export declare function resolveCachePath(name: string, projectRoot?: string): string;
 export declare function parseRefreshEnv(value: string | undefined): "all" | Set<string> | undefined;
 export declare function dialUpstream(name: string, config: McpServerConfig): Promise<McpClient>;

package/dist/mcp-proxy.js

@@ -1,4 +1,3 @@
-import { existsSync } from "node:fs";
 import { lstat, mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { createHash, randomUUID } from "node:crypto";
@@ -6,6 +5,8 @@ import { createLogger } from "toolcraft-design";
 import { HttpTransport, McpClient, StdioTransport } from "tiny-mcp-client";
 import { hasOwnErrorCode } from "./error-codes.js";
 import { convertJsonSchema } from "./json-schema-converter.js";
+import { findProjectRoot } from "./project-root.js";
+export { findProjectRoot } from "./project-root.js";
 const GROUP_CONFIG_SYMBOL_DESCRIPTION = "toolcraft.group.config";
 const MCP_PROXY_SCHEMA_URL = "https://poe-platform.github.io/poe-code/schemas/toolcraft/mcp-proxy.schema.json";
 const DEFAULT_CLIENT_INFO = {
@@ -400,22 +401,6 @@ function collectProxyGroups(root) {
 export function hasMcpProxyGroups(root) {
     return collectProxyGroups(root).length > 0;
 }
-export function findProjectRoot(from = process.cwd()) {
-    let current = process.cwd();
-    if (from !== current) {
-        current = path.resolve(from);
-    }
-    while (true) {
-        if (existsSync(path.join(current, "package.json"))) {
-            return current;
-        }
-        const parent = path.dirname(current);
-        if (parent === current) {
-            return undefined;
-        }
-        current = parent;
-    }
-}
 export function resolveCachePath(name, projectRoot) {
     const resolvedProjectRoot = projectRoot ?? findProjectRoot();
     if (resolvedProjectRoot === undefined) {

package/dist/node-require-shim.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node-require-shim.js

@@ -0,0 +1,4 @@
+import { createRequire } from "node:module";
+import path from "node:path";
+const globalWithRequire = globalThis;
+globalWithRequire.require ??= createRequire(path.join(process.cwd(), "package.json"));

package/dist/project-root.d.ts

@@ -0,0 +1 @@
+export declare function findProjectRoot(from?: string): string | undefined;

package/dist/project-root.js

@@ -0,0 +1,15 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+export function findProjectRoot(from = process.cwd()) {
+    let current = from === process.cwd() ? process.cwd() : path.resolve(from);
+    while (true) {
+        if (existsSync(path.join(current, "package.json"))) {
+            return current;
+        }
+        const parent = path.dirname(current);
+        if (parent === current) {
+            return undefined;
+        }
+        current = parent;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -55,7 +55,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.85",
+    "toolcraft-schema": "0.0.86",
     "commander": "^13.1.0",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",