toolcraft 0.0.8 → 0.0.10

package/dist/cli.js

@@ -714,20 +714,36 @@ function formatSecretDescription(secret) {
     }
     return secret.optional === true ? "Optional secret" : "Required secret";
 }
-function formatCommandRowName(node, depth) {
-    const name = node.aliases.length === 0 ? node.name : `${node.name} (${node.aliases.join(", ")})`;
+function wrapOptionalCommandParameterToken(token, optional) {
+    return optional ? `[${token}]` : token;
+}
+function formatCommandDynamicParameterTokens(field, casing) {
+    const optional = field.optional || field.hasDefault;
+    return formatDynamicHelpFields(field, casing).map((row) => wrapOptionalCommandParameterToken(row.flags, optional));
+}
+function formatCommandParameterTokens(command, casing, globalLongOptionFlags) {
+    const collected = collectFields(command.params, casing, globalLongOptionFlags);
+    const fields = assignPositionals(collected.fields, command.positional);
+    return fields
+        .map((field) => wrapOptionalCommandParameterToken(formatHelpFieldFlags(field, globalLongOptionFlags), field.positionalIndex === undefined && (field.optional || field.hasDefault)))
+        .concat(collected.dynamicFields.flatMap((field) => formatCommandDynamicParameterTokens(field, casing)));
+}
+function formatCommandRowName(node, depth, 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 `${"  ".repeat(depth)}${name}`;
 }
-function formatCommandRows(group, scope, depth = 0) {
+function formatCommandRows(group, scope, casing, globalLongOptionFlags, depth = 0) {
     return getVisibleChildren(group, scope).flatMap((child) => {
         const row = {
-            name: formatCommandRowName(child, depth),
+            name: formatCommandRowName(child, depth, casing, globalLongOptionFlags),
             description: child.description ?? "",
         };
         if (child.kind === "command") {
             return [row];
         }
-        return [row, ...formatCommandRows(child, scope, depth + 1)];
+        return [row, ...formatCommandRows(child, scope, casing, globalLongOptionFlags, depth + 1)];
     });
 }
 function formatGlobalOptionRows(showVersion, presetsEnabled) {
@@ -766,9 +782,10 @@ function buildUsageLine(breadcrumb, rootUsageName, suffix) {
     const subPath = breadcrumb.slice(1).join(" ");
     return subPath ? `${rootUsageName} ${subPath} ${suffix}` : `${rootUsageName} ${suffix}`;
 }
-function renderGroupHelp(group, breadcrumb, scope, showVersion, presetsEnabled, rootUsageName) {
+function renderGroupHelp(group, breadcrumb, scope, casing, showVersion, presetsEnabled, rootUsageName) {
     const sections = [];
-    const commandRows = formatCommandRows(group, scope);
+    const globalLongOptionFlags = getGlobalLongOptionFlags(presetsEnabled);
+    const commandRows = formatCommandRows(group, scope, casing, globalLongOptionFlags);
     if (commandRows.length > 0) {
         sections.push(`${text.section("Commands:")}\n${formatCommandList(commandRows)}`);
     }
@@ -833,7 +850,7 @@ async function renderGeneratedHelp(root, argv, options) {
     const casing = options.casing ?? "kebab";
     await withOutputFormat(output, async () => {
         const rendered = target.node.kind === "group"
-            ? renderGroupHelp(target.node, target.breadcrumb, "cli", options.version !== undefined, options.presets === true, options.rootUsageName)
+            ? renderGroupHelp(target.node, target.breadcrumb, "cli", casing, options.version !== undefined, options.presets === true, options.rootUsageName)
             : renderLeafHelp(target.node, target.breadcrumb, casing, options.presets === true, options.rootUsageName);
         process.stdout.write(rendered);
     });

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/README.md

@@ -0,0 +1,97 @@
+# tiny-mcp-client
+
+`tiny-mcp-client` is a lightweight Model Context Protocol client used by tests, fixtures, and package integrations. It supports stdio transports, streamable HTTP transports, in-memory test pairs, JSON-RPC helpers, and OAuth metadata discovery for OAuth-protected MCP HTTP servers.
+
+## Usage
+
+```ts
+import { HttpTransport, McpClient } from "tiny-mcp-client";
+
+const client = new McpClient({
+  clientInfo: { name: "demo", version: "0.1.0" },
+});
+
+await client.connect(new HttpTransport({ url: "http://127.0.0.1:3000/mcp" }));
+const tools = await client.listTools();
+console.log(tools);
+await client.close();
+```
+
+## Transports
+
+| Transport | Description |
+|-----------|-------------|
+| `StdioTransport` | Spawns an MCP server process and communicates over stdio. |
+| `HttpTransport` | Connects to streamable HTTP MCP endpoints, including session IDs, SSE GET streams, and session termination. |
+| `createInMemoryTransportPair()` | Creates paired streams for in-process tests. |
+
+## OAuth HTTP support
+
+`HttpTransport` accepts `oauth` options from `mcp-oauth`. When a protected server returns a Bearer `WWW-Authenticate` challenge, the transport discovers protected-resource metadata, loads authorization-server metadata, lets the OAuth provider handle authorization, and retries the request when credentials are available.
+
+```ts
+import { HttpTransport, createDefaultOAuthClientProvider } from "tiny-mcp-client";
+
+const transport = new HttpTransport({
+  url: "https://mcp.example.com/mcp",
+  oauth: {
+    provider: createDefaultOAuthClientProvider({
+      client: {
+        mode: "dynamic",
+        metadata: {
+          clientName: "tiny-client",
+        },
+      },
+      browser: {
+        openBrowser: async (url) => {
+          console.log(`Open ${url}`);
+        },
+      },
+    }),
+  },
+});
+```
+
+You can also call `discoverOAuthMetadata(resourceUrl, options)` directly, or instantiate `OAuthMetadataDiscovery` with a custom `fetch` implementation and shared cache.
+
+## Testing helpers
+
+- `createTestPair()` and `createSdkTestPair()` create paired client/server fixtures.
+- `createInMemoryTransportPair()` is useful for fast unit tests without opening sockets or spawning processes.
+- JSON-RPC error constants are exported for assertions: `ERROR_PARSE`, `ERROR_INVALID_REQUEST`, `ERROR_METHOD_NOT_FOUND`, `ERROR_INVALID_PARAMS`, and `ERROR_INTERNAL`.
+
+## Config options
+
+### `McpClientOptions`
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `clientInfo` | `{ name: string; version: string }` | Required client identity sent during initialize. |
+| `capabilities` | `ClientCapabilities` | Optional MCP client capabilities. |
+| `onToolsChanged`, `onResourcesChanged`, `onPromptsChanged` | callbacks | Optional notification handlers. |
+| `onResourceUpdated`, `onLog`, `onProgress` | callbacks | Optional resource/log/progress handlers. |
+| `onSamplingRequest`, `onRootsList` | callbacks | Optional server-to-client request handlers. |
+
+### `HttpTransportOptions`
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `url` | `string` | MCP HTTP endpoint URL. |
+| `headers` | `HeadersInit` | Static headers added to requests. |
+| `fetch` | `(input, init?) => Promise<Response>` | Custom fetch implementation. |
+| `oauth` | `OAuthClientProviderOptions` | Enables OAuth authorization handling. |
+| `oauthDiscoveryCache` | `OAuthDiscoveryCache` | Optional shared metadata cache. |
+
+### `StdioTransportOptions`
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `command` | `string` | Server executable. |
+| `args` | `string[]` | Server args. |
+| `cwd` | `string` | Server working directory. |
+| `env` | `NodeJS.ProcessEnv` | Server environment. |
+| `spawn` | `StdioSpawn` | Custom spawn function for tests. |
+
+## Environment variables
+
+This package does not expose public environment variables. Pass process environment explicitly through `StdioTransportOptions.env` when a spawned MCP server needs it.

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.8",
+  "version": "0.0.10",
   "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.8"
+    "toolcraft-schema": "^0.0.10"
   },
   "files": [
     "dist"