toolcraft 0.0.9 → 0.0.11

package/README.md

@@ -459,6 +459,7 @@ If you have an existing MCP server you want to keep running, use the MCP proxy:
 - `services?` / `humanInLoop?` / `apiVersion?`
 - `projectRoot?: string` — root used for MCP proxy cache files (`.toolcraft/mcp/*.json`).
 - `tools?: string[]` — allowlist of MCP tool names or group prefixes. Tool names are `__`-joined snake_case path segments (`root__bot__create`); a prefix like `root__bot` includes every descendant tool.
+- `omitRootToolNamePrefix?: boolean` — defaults to `false`. Set to `true` to omit the root group name from single-root MCP tool names (`bot__create`).
 - `casing?: "snake" | "camel"` — affects MCP **input-schema property names** only. Tool names always stay `__`-joined snake_case.
 
 ### `HumanInLoopRuntimeOptions`

package/dist/mcp.d.ts

@@ -20,6 +20,12 @@ export interface RunMCPOptions<TServices extends object = Record<string, unknown
      * that subtree.
      */
     tools?: string[];
+    /**
+     * Omit the root group name from MCP tool names for a single root group.
+     *
+     * Defaults to false, so existing MCP tool names keep the root group prefix.
+     */
+    omitRootToolNamePrefix?: boolean;
     services?: TServices;
     /**
      * Controls MCP input-schema key casing and accepted argument-key casing.

package/dist/mcp.js

@@ -162,7 +162,7 @@ function matchesAllowlist(toolName, allowlist) {
 function formatToolName(path) {
     return path.map((segment) => formatSegment(segment, "snake")).join("__");
 }
-function enumerateTools(root, casing, allowlist) {
+function enumerateTools(root, casing, allowlist, omitRootToolNamePrefix) {
     const tools = [];
     function visit(node, toolPath, commandPath) {
         if (node.kind === "command") {
@@ -192,7 +192,7 @@ function enumerateTools(root, casing, allowlist) {
             visit(child, nextToolPath, nextCommandPath);
         }
     }
-    const rootPath = root.name.length === 0 ? [] : [root.name];
+    const rootPath = omitRootToolNamePrefix || root.name.length === 0 ? [] : [root.name];
     for (const child of root.children) {
         visit(child, rootPath, []);
     }
@@ -365,7 +365,7 @@ function createResolvedMCPServer(root, options) {
         root,
     };
     validateServices(services);
-    const tools = enumerateTools(root, casing, options.tools);
+    const tools = enumerateTools(root, casing, options.tools, options.omitRootToolNamePrefix ?? false);
     const version = resolveMCPVersion(options.version);
     const server = createServer({ name: options.name, version });
     for (const tool of tools) {

package/node_modules/tiny-mcp-client/.turbo/turbo-build.log

@@ -1,3 +1,6 @@
+npm warn Unknown project config "link-workspace-packages". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
+npm warn Unknown project config "package-manager-strict". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
+npm warn Unknown project config "prefer-workspace-packages". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
 
 > tiny-mcp-client@0.1.0 build
 > tsc

package/node_modules/tiny-mcp-client/dist/internal.d.ts

@@ -1,14 +1,14 @@
 import type { ChildProcessWithoutNullStreams, SpawnOptions } from "node:child_process";
 import type { Readable, Writable } from "node:stream";
 import type { JSONRPCMessage as SdkJsonRpcMessage } from "@modelcontextprotocol/sdk/types.js";
-import { type OAuthClientProviderOptions } from "mcp-oauth";
+import { type OAuthClientProviderOptions } from "../../mcp-oauth/dist/index.js";
 import type { Server as TinyStdioMcpServer } from "tiny-stdio-mcp-server";
 import type { OAuthDiscoveryCache } from "./oauth-discovery.js";
 export { OAuthMetadataDiscovery, discoverOAuthMetadata, parseBearerWwwAuthenticateHeader, resolveAuthorizationServerMetadataUrl, resolveProtectedResourceMetadataUrl, } from "./oauth-discovery.js";
-export { createAuthStoreSessionStore, createDefaultOAuthClientProvider, } from "mcp-oauth";
+export { createAuthStoreSessionStore, createDefaultOAuthClientProvider, } from "../../mcp-oauth/dist/index.js";
 export type { OAuthDiscoveryCache, } from "./oauth-discovery.js";
 export type { OAuthAuthorizationServerMetadata, OAuthDiscoveryResult, OAuthMetadataFetch, OAuthProtectedResourceMetadata, OAuthUnauthorizedChallenge } from "./oauth-discovery.js";
-export type { DefaultOAuthClientProviderOptions, OAuthClientProvider, OAuthClientProviderOptions, OAuthSessionStore, StoredOAuthSession, } from "mcp-oauth";
+export type { DefaultOAuthClientProviderOptions, OAuthClientProvider, OAuthClientProviderOptions, OAuthSessionStore, StoredOAuthSession, } from "../../mcp-oauth/dist/index.js";
 export type RequestId = number | string;
 export interface Implementation {
     name: string;

package/node_modules/tiny-mcp-client/dist/internal.js

@@ -1,9 +1,9 @@
 import { spawn } from "node:child_process";
 import { PassThrough } from "node:stream";
-import { createOAuthClientProvider, OAuthError, } from "mcp-oauth";
+import { createOAuthClientProvider, OAuthError, } from "../../mcp-oauth/dist/index.js";
 import { OAuthMetadataDiscovery, parseBearerWwwAuthenticateHeader, } from "./oauth-discovery.js";
 export { OAuthMetadataDiscovery, discoverOAuthMetadata, parseBearerWwwAuthenticateHeader, resolveAuthorizationServerMetadataUrl, resolveProtectedResourceMetadataUrl, } from "./oauth-discovery.js";
-export { createAuthStoreSessionStore, createDefaultOAuthClientProvider, } from "mcp-oauth";
+export { createAuthStoreSessionStore, createDefaultOAuthClientProvider, } from "../../mcp-oauth/dist/index.js";
 const MCP_PROTOCOL_VERSION = "2025-03-26";
 export class McpClient {
     currentState = "disconnected";

package/node_modules/tiny-mcp-client/dist/oauth-discovery.d.ts

@@ -1,4 +1,4 @@
-import type { OAuthAuthorizationServerMetadata, OAuthDiscoveryResult, OAuthMetadataFetch, OAuthProtectedResourceMetadata, OAuthUnauthorizedChallenge } from "mcp-oauth";
+import type { OAuthAuthorizationServerMetadata, OAuthDiscoveryResult, OAuthMetadataFetch, OAuthProtectedResourceMetadata, OAuthUnauthorizedChallenge } from "../../mcp-oauth/dist/index.js";
 export type { OAuthAuthorizationServerMetadata, OAuthDiscoveryResult, OAuthMetadataFetch, OAuthProtectedResourceMetadata, OAuthUnauthorizedChallenge, };
 export interface OAuthDiscoveryCache {
     get(resourceUrl: string): OAuthDiscoveryResult | null | undefined | Promise<OAuthDiscoveryResult | null | undefined>;

package/node_modules/tiny-mcp-client/dist/oauth-discovery.js

@@ -1,4 +1,4 @@
-import { canonicalizeResourceIndicator } from "mcp-oauth";
+import { canonicalizeResourceIndicator } from "../../mcp-oauth/dist/index.js";
 function defaultOAuthMetadataFetch(input, init) {
     return fetch(input, init);
 }

package/node_modules/tiny-mcp-client/src/http-oauth.integration.test.ts

@@ -4,7 +4,7 @@ import {
   OAuthError,
   type OAuthSessionStore,
   type StoredOAuthSession,
-} from "mcp-oauth";
+} from "../../mcp-oauth/dist/index.js";
 import { nodeFetch } from "tiny-http-mcp-server/testing";
 import {
   createMcpOAuthTestServer,
@@ -86,7 +86,12 @@ function cloneResponse(response: Response, body: string): Response {
   });
 }
 
-async function reservePort(hostname: string): Promise<number> {
+interface BoundLoopbackServerFactory {
+  createServer(): http.Server;
+  port: number;
+}
+
+async function createBoundLoopbackServerFactory(hostname: string): Promise<BoundLoopbackServerFactory> {
   const server = http.createServer();
 
   await new Promise<void>((resolve, reject) => {
@@ -106,43 +111,23 @@ async function reservePort(hostname: string): Promise<number> {
         resolve();
       });
     });
-    throw new Error("Expected temporary port reservation to bind to a TCP port");
+    throw new Error("Expected loopback test server to bind to a TCP port");
   }
 
-  const port = address.port;
-  await new Promise<void>((resolve, reject) => {
-    server.close((error) => {
-      if (error !== undefined) {
-        reject(error);
-        return;
-      }
-
-      resolve();
-    });
-  });
-  return port;
-}
-
-function createFixedPortServerFactory(port: number): () => http.Server {
-  return () => {
-    const server = http.createServer();
-    const originalListen = server.listen.bind(server);
-
-    server.listen = ((...args: unknown[]) => {
-      let callback: (() => void) | undefined;
-
-      for (let index = args.length - 1; index >= 0; index -= 1) {
-        const value = args[index];
-        if (typeof value === "function") {
-          callback = value as () => void;
-          break;
-        }
-      }
-
-      return originalListen(port, "127.0.0.1", callback);
-    }) as typeof server.listen;
+  server.listen = ((...args: Parameters<http.Server["listen"]>) => {
+    const callback = [...args].reverse().find((value) => typeof value === "function");
+    if (typeof callback === "function") {
+      queueMicrotask(() => callback());
+    }
 
     return server;
+  }) as typeof server.listen;
+
+  return {
+    createServer(): http.Server {
+      return server;
+    },
+    port: address.port,
   };
 }
 
@@ -557,10 +542,10 @@ describe("HttpTransport OAuth integration", () => {
   });
 
   it("skips DCR for a configured static client and still completes the PKCE flow", async () => {
-    const redirectPort = await reservePort("127.0.0.1");
-    const redirectUri = `http://127.0.0.1:${redirectPort}/callback`;
+    const loopbackServer = await createBoundLoopbackServerFactory("127.0.0.1");
+    const redirectUri = `http://127.0.0.1:${loopbackServer.port}/callback`;
     const harness = await createHarness({
-      createServer: createFixedPortServerFactory(redirectPort),
+      createServer: loopbackServer.createServer,
       oauthClient: {
         mode: "static",
         clientId: "static-client",

package/node_modules/tiny-mcp-client/src/internal.ts

@@ -8,7 +8,7 @@ import {
   OAuthError,
   type OAuthClientProvider,
   type OAuthClientProviderOptions,
-} from "mcp-oauth";
+} from "../../mcp-oauth/dist/index.js";
 import type { Server as TinyStdioMcpServer } from "tiny-stdio-mcp-server";
 import {
   OAuthMetadataDiscovery,
@@ -28,7 +28,7 @@ export {
 export {
   createAuthStoreSessionStore,
   createDefaultOAuthClientProvider,
-} from "mcp-oauth";
+} from "../../mcp-oauth/dist/index.js";
 export type {
   OAuthDiscoveryCache,
 } from "./oauth-discovery.js";
@@ -39,7 +39,7 @@ export type {
   OAuthClientProviderOptions,
   OAuthSessionStore,
   StoredOAuthSession,
-} from "mcp-oauth";
+} from "../../mcp-oauth/dist/index.js";
 
 export type RequestId = number | string;
 

package/node_modules/tiny-mcp-client/src/oauth-discovery.ts

@@ -4,8 +4,8 @@ import type {
   OAuthMetadataFetch,
   OAuthProtectedResourceMetadata,
   OAuthUnauthorizedChallenge,
-} from "mcp-oauth";
-import { canonicalizeResourceIndicator } from "mcp-oauth";
+} from "../../mcp-oauth/dist/index.js";
+import { canonicalizeResourceIndicator } from "../../mcp-oauth/dist/index.js";
 
 export type {
   OAuthAuthorizationServerMetadata,

package/node_modules/tiny-mcp-client/src/package-runtime.test.ts

@@ -0,0 +1,25 @@
+import { execFile } from "node:child_process";
+import { pathToFileURL } from "node:url";
+import { promisify } from "node:util";
+import { describe, expect, it } from "vitest";
+
+const execFileAsync = promisify(execFile);
+
+describe("tiny-mcp-client runtime imports", () => {
+  it("loads the source entrypoint in a clean Node process", async () => {
+    const moduleUrl = pathToFileURL(new URL("./index.ts", import.meta.url).pathname).href;
+
+    const result = await execFileAsync(process.execPath, [
+        "--import",
+        "tsx",
+        "--input-type=module",
+        "--eval",
+        `await import(${JSON.stringify(moduleUrl)});`,
+      ], {
+        cwd: new URL("../../..", import.meta.url),
+    });
+
+    expect(result.stdout).toBe("");
+    expect(result.stderr).not.toContain("SyntaxError");
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,7 @@
     "commander": "^14.0.3",
     "console-table-printer": "^2.15.0",
     "tiny-stdio-mcp-server": "^0.1.0",
-    "toolcraft-schema": "^0.0.9"
+    "toolcraft-schema": "^0.0.11"
   },
   "files": [
     "dist"