@goke/mcp 0.0.6 → 0.0.8

package/dist/__test__/add-cli-tools-to-mcp.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-cli-tools-to-mcp.test.d.ts","sourceRoot":"","sources":["../../src/__test__/add-cli-tools-to-mcp.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/{test → __test__}/add-cli-tools-to-mcp.test.js

@@ -9,7 +9,7 @@ import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError } fr
 import { goke, wrapJsonSchema } from "goke";
 import { z } from "zod";
 import { describe, expect, it } from "vitest";
-import { addCliToolsToMcp } from "../src/cli-to-mcp.js";
+import { addCliToolsToMcp } from "../cli-to-mcp.js";
 function createCli() {
     const cli = goke("test-cli");
     cli

package/dist/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiB,eAAe,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AA0BxF;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC,CA4E7F;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAazD"}

package/dist/cli-to-mcp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-to-mcp.d.ts","sourceRoot":"","sources":["../src/cli-to-mcp.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AASxE,OAAO,EAAmD,KAAK,IAAI,EAA6B,MAAM,MAAM,CAAC;AAwD7G,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,IAAI,CAAC;IACV,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;CACpD;AA4XD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAyCvE"}

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAKjC,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,YAAY,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG/D,YAAY,EAAE,SAAS,EAAE,CAAC;AAC1B,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,CAAC,CAAC;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,IAAI,CAAC;IACV;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAErC;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAEvF;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,EAAE,cAAc,CAAC;IAEvB;;OAEG;IACH,SAAS,EAAE,MAAM,cAAc,GAAG,SAAS,CAAC;IAE5C;;OAEG;IACH,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,KAAK,IAAI,CAAC;CACxD;AAmID;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyMlF"}

package/dist/local-callback-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-callback-server.d.ts","sourceRoot":"","sources":["../src/local-callback-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AA2FxE;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC;IACtF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC,CAgFD"}

package/dist/oauth-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../src/oauth-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EACV,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,EACnB,WAAW,EACZ,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CACjD;AAED;;;;;;GAMG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAC3D,OAAO,CAAC,kBAAkB,CAAqC;IAC/D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,qBAAqB,CAAkB;IAE/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAiC;gBAErD,OAAO,EAAE,wBAAwB;IAU7C,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;;OAGG;IACH,IAAI,oBAAoB,IAAI,GAAG,GAAG,SAAS,CAE1C;IAEK,iBAAiB,IAAI,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAIhE,qBAAqB,CAAC,iBAAiB,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnF,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/B,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,IAAI,cAAc,IAAI,mBAAmB,CAKxC;IAED;;;OAGG;IACH,uBAAuB,CAAC,gBAAgB,EAAE,GAAG,GAAG,IAAI;IAI9C,MAAM,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAI1C,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpD;;OAEG;IACH,QAAQ,IAAI,aAAa;IASzB,OAAO,CAAC,kBAAkB;CAK3B;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB,CAE5F"}

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAEpG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;IAEtC;;;OAGG;IACH,IAAI,EAAE,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,KAAK,IAAI,CAAC;IAEjD;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAElC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,kDAAkD;IAClD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,sDAAsD;IACtD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf"}

package/package.json

@@ -1,29 +1,42 @@
 {
   "name": "@goke/mcp",
-  "version": "0.0.6",
-  "description": "Dynamically generate CLI commands from MCP server tools",
+  "version": "0.0.8",
   "type": "module",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "description": "Dynamically generate CLI commands from MCP server tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/remorses/goke",
+    "directory": "mcp"
+  },
+  "homepage": "https://github.com/remorses/goke/tree/main/mcp",
+  "bugs": "https://github.com/remorses/goke/issues",
+  "keywords": [
+    "mcp",
+    "cli",
+    "goke",
+    "model-context-protocol"
+  ],
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
+    "./package.json": "./package.json",
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "default": "./dist/index.js"
     },
-    "./src/index.js": {
+    "./src": {
       "types": "./src/index.ts",
-      "import": "./src/index.ts"
+      "default": "./src/index.ts"
+    },
+    "./src/*": {
+      "types": "./src/*.ts",
+      "default": "./src/*.ts"
     }
   },
   "files": [
     "dist",
     "src"
   ],
-  "keywords": [
-    "mcp",
-    "cli",
-    "goke"
-  ],
   "author": "Tommaso De Rossi, morse <beats.by.morse@gmail.com>",
   "license": "MIT",
   "dependencies": {
@@ -38,12 +51,11 @@
     "@types/node": "^22.19.7",
     "vitest": "^3.1.0",
     "zod": "^4.3.6",
-    "goke": "^6.2.0"
+    "goke": "^6.2.3"
   },
   "scripts": {
     "clean": "rm -rf dist",
     "build": "pnpm clean && tsc",
-    "test": "vitest --run",
-    "watch": "tsc -w"
+    "test": "vitest --run"
   }
 }

package/src/__test__/add-cli-tools-to-mcp.test.ts

@@ -0,0 +1,459 @@
+/**
+ * End-to-end tests for exposing a goke CLI as MCP tools.
+ */
+
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError } from "@modelcontextprotocol/sdk/types.js";
+import { goke, wrapJsonSchema } from "goke";
+import { z } from "zod";
+import { describe, expect, it } from "vitest";
+import { addCliToolsToMcp } from "../cli-to-mcp.js";
+
+function createCli() {
+  const cli = goke("test-cli");
+
+  cli
+    .command("say hi", "Say hello")
+    .option("--name <name>", z.string().describe("Person to greet"))
+    .option("--caps", z.boolean().default(false).describe("Uppercase output"))
+    .action((options: { name: string; caps: boolean }) => {
+      const message = `Hello ${options.name}!`;
+      return options.caps ? message.toUpperCase() : message;
+    });
+
+  cli
+    .command("sum-values", "Add two numbers")
+    .option(
+      "--left <left>",
+      wrapJsonSchema({
+        type: "number",
+        description: "Left operand",
+      }),
+    )
+    .option(
+      "--right <right>",
+      wrapJsonSchema({
+        type: "number",
+        description: "Right operand",
+      }),
+    )
+    .action((options: { left: number; right: number }) => ({
+      sum: options.left + options.right,
+    }));
+
+  cli
+    .command("echo <message>", "Echo positional message")
+    .option(
+      "--repeat [repeat]",
+      wrapJsonSchema({
+        type: "integer",
+        default: 2,
+        description: "Repeat count",
+      }),
+    )
+    .action((message: string, options: { repeat: number }) => {
+      return message.repeat(options.repeat);
+    });
+
+  cli
+    .command("string-options", "Infer option types from plain string descriptions")
+    .option("--title <title>", "Required title")
+    .option("--tag [tag]", "Optional tag")
+    .option("--dry-run", "Dry run flag")
+    .action((options: { title: string; tag?: string; dryRun?: boolean }) => {
+      return options;
+    });
+
+  return cli;
+}
+
+function firstTextContent(result: Awaited<ReturnType<Client["callTool"]>>): string {
+  const content = "content" in result ? (result as { content: Array<{ type: string; text?: string }> }).content : [];
+  return content.find((entry) => entry.type === "text")?.text ?? "";
+}
+
+function expectCommandDescriptions(tools: Array<{ name: string; description?: string }>): void {
+  const descriptionByName = Object.fromEntries(tools.map((tool) => [tool.name, tool.description]));
+
+  expect(descriptionByName).toMatchObject({
+    say_hi: "Say hello",
+    "sum-values": "Add two numbers",
+    echo: "Echo positional message",
+    "string-options": "Infer option types from plain string descriptions",
+  });
+}
+
+function addUserLowLevelTools(server: Server): void {
+  server.registerCapabilities({ tools: { listChanged: true } });
+  server.setRequestHandler(ListToolsRequestSchema, () => ({
+    tools: [
+      {
+        name: "user_tool",
+        description: "Tool added directly by user",
+        inputSchema: {
+          type: "object",
+          properties: {},
+        },
+      },
+    ],
+  }));
+
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    if (request.params.name !== "user_tool") {
+      throw new McpError(ErrorCode.InvalidParams, `Tool ${request.params.name} not found`);
+    }
+    return {
+      content: [{ type: "text", text: "from-user-low-level" }],
+    };
+  });
+}
+
+async function runScenario(
+  mode: "low-level-server" | "mcp-server",
+): Promise<{
+  tools: Array<{ name: string; description?: string }>;
+  greeting: string;
+  sum: string;
+  echo: string;
+  stringOptions: string;
+}> {
+  const cli = createCli();
+  const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+
+  const server = mode === "low-level-server"
+    ? new Server({ name: "test-server", version: "1.0.0" }, { capabilities: {} })
+    : new McpServer({ name: "test-server", version: "1.0.0" });
+
+  addCliToolsToMcp({ cli, server });
+
+  const client = new Client({ name: "test-client", version: "1.0.0" }, { capabilities: {} });
+
+  try {
+    await server.connect(serverTransport);
+    await client.connect(clientTransport);
+
+    const toolsResult = await client.listTools();
+
+    const greetingResult = await client.callTool({
+      name: "say_hi",
+      arguments: { name: "Tommy" },
+    });
+
+    const sumResult = await client.callTool({
+      name: "sum-values",
+      arguments: { left: 2, right: 3 },
+    });
+
+    const echoResult = await client.callTool({
+      name: "echo",
+      arguments: { message: "ha" },
+    });
+
+    const stringOptionsResult = await client.callTool({
+      name: "string-options",
+      arguments: {
+        title: "Release notes",
+        dryRun: true,
+      },
+    });
+
+    return {
+      tools: toolsResult.tools,
+      greeting: firstTextContent(greetingResult),
+      sum: firstTextContent(sumResult),
+      echo: firstTextContent(echoResult),
+      stringOptions: firstTextContent(stringOptionsResult),
+    };
+  } finally {
+    await client.close();
+    await server.close();
+  }
+}
+
+describe("addCliToolsToMcp", () => {
+  it("mounts CLI tools and executes calls with low-level Server", async () => {
+    const result = await runScenario("low-level-server");
+
+    expect("\n" + JSON.stringify(result.tools, null, 2)).toMatchInlineSnapshot(`
+      "
+      [
+        {
+          "name": "say_hi",
+          "description": "Say hello",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
+                "type": "string",
+                "description": "Person to greet"
+              },
+              "caps": {
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
+                "default": false,
+                "description": "Uppercase output",
+                "type": "boolean"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        {
+          "name": "sum-values",
+          "description": "Add two numbers",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "left": {
+                "type": "number",
+                "description": "Left operand"
+              },
+              "right": {
+                "type": "number",
+                "description": "Right operand"
+              }
+            },
+            "required": [
+              "left",
+              "right"
+            ]
+          }
+        },
+        {
+          "name": "echo",
+          "description": "Echo positional message",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string",
+                "description": "Positional argument message"
+              },
+              "repeat": {
+                "type": "integer",
+                "default": 2,
+                "description": "Repeat count"
+              }
+            },
+            "required": [
+              "message"
+            ]
+          }
+        },
+        {
+          "name": "string-options",
+          "description": "Infer option types from plain string descriptions",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "type": "string",
+                "description": "Required title"
+              },
+              "tag": {
+                "type": "string",
+                "description": "Optional tag"
+              },
+              "dryRun": {
+                "type": "boolean",
+                "description": "Dry run flag"
+              }
+            },
+            "required": [
+              "title"
+            ]
+          }
+        }
+      ]"
+    `);
+
+    expectCommandDescriptions(result.tools);
+
+    expect(result.greeting).toBe("Hello Tommy!");
+    expect(result.sum).toBe('{\n  "sum": 5\n}');
+    expect(result.echo).toBe("haha");
+    expect(result.stringOptions).toBe('{\n  "title": "Release notes",\n  "dryRun": true\n}');
+  });
+
+  it("mounts CLI tools and executes calls with high-level McpServer", async () => {
+    const result = await runScenario("mcp-server");
+
+    expect("\n" + JSON.stringify(result.tools, null, 2)).toMatchInlineSnapshot(`
+      "
+      [
+        {
+          "name": "say_hi",
+          "description": "Say hello",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
+                "type": "string",
+                "description": "Person to greet"
+              },
+              "caps": {
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
+                "default": false,
+                "description": "Uppercase output",
+                "type": "boolean"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        {
+          "name": "sum-values",
+          "description": "Add two numbers",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "left": {
+                "type": "number",
+                "description": "Left operand"
+              },
+              "right": {
+                "type": "number",
+                "description": "Right operand"
+              }
+            },
+            "required": [
+              "left",
+              "right"
+            ]
+          }
+        },
+        {
+          "name": "echo",
+          "description": "Echo positional message",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string",
+                "description": "Positional argument message"
+              },
+              "repeat": {
+                "type": "integer",
+                "default": 2,
+                "description": "Repeat count"
+              }
+            },
+            "required": [
+              "message"
+            ]
+          }
+        },
+        {
+          "name": "string-options",
+          "description": "Infer option types from plain string descriptions",
+          "inputSchema": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "type": "string",
+                "description": "Required title"
+              },
+              "tag": {
+                "type": "string",
+                "description": "Optional tag"
+              },
+              "dryRun": {
+                "type": "boolean",
+                "description": "Dry run flag"
+              }
+            },
+            "required": [
+              "title"
+            ]
+          }
+        }
+      ]"
+    `);
+
+    expectCommandDescriptions(result.tools);
+
+    expect(result.greeting).toBe("Hello Tommy!");
+    expect(result.sum).toBe('{\n  "sum": 5\n}');
+    expect(result.echo).toBe("haha");
+    expect(result.stringOptions).toBe('{\n  "title": "Release notes",\n  "dryRun": true\n}');
+  });
+
+  it("composes with user tools already mounted on low-level Server", async () => {
+    const cli = createCli();
+    const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+    const server = new Server({ name: "test-server", version: "1.0.0" }, { capabilities: {} });
+    const client = new Client({ name: "test-client", version: "1.0.0" }, { capabilities: {} });
+
+    addUserLowLevelTools(server);
+    addCliToolsToMcp({ cli, server, commandFilter: (name) => name === "say hi" });
+
+    try {
+      await server.connect(serverTransport);
+      await client.connect(clientTransport);
+
+      const tools = await client.listTools();
+      expect(tools.tools.map((tool) => tool.name).sort()).toEqual(["say_hi", "user_tool"]);
+
+      const cliResult = await client.callTool({
+        name: "say_hi",
+        arguments: { name: "Tommy" },
+      });
+
+      const userResult = await client.callTool({
+        name: "user_tool",
+        arguments: {},
+      });
+
+      expect(firstTextContent(cliResult)).toBe("Hello Tommy!");
+      expect(firstTextContent(userResult)).toBe("from-user-low-level");
+    } finally {
+      await client.close();
+      await server.close();
+    }
+  });
+
+  it("composes with user tools already mounted on high-level McpServer", async () => {
+    const cli = createCli();
+    const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+    const server = new McpServer({ name: "test-server", version: "1.0.0" });
+    const client = new Client({ name: "test-client", version: "1.0.0" }, { capabilities: {} });
+
+    server.tool("user_tool", "Tool added directly by user", async () => ({
+      content: [{ type: "text", text: "from-user-mcp-server" }],
+    }));
+
+    addCliToolsToMcp({ cli, server, commandFilter: (name) => name === "say hi" });
+
+    try {
+      await server.connect(serverTransport);
+      await client.connect(clientTransport);
+
+      const tools = await client.listTools();
+      expect(tools.tools.map((tool) => tool.name).sort()).toEqual(["say_hi", "user_tool"]);
+
+      const cliResult = await client.callTool({
+        name: "say_hi",
+        arguments: { name: "Tommy" },
+      });
+
+      const userResult = await client.callTool({
+        name: "user_tool",
+        arguments: {},
+      });
+
+      expect(firstTextContent(cliResult)).toBe("Hello Tommy!");
+      expect(firstTextContent(userResult)).toBe("from-user-mcp-server");
+    } finally {
+      await client.close();
+      await server.close();
+    }
+  });
+});

package/dist/src/auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/auth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiB,eAAe,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AA0BxF;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC,CA4E7F;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAazD"}

package/dist/src/cli-to-mcp.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli-to-mcp.d.ts","sourceRoot":"","sources":["../../src/cli-to-mcp.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AASxE,OAAO,EAAmD,KAAK,IAAI,EAA6B,MAAM,MAAM,CAAC;AAwD7G,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,IAAI,CAAC;IACV,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;CACpD;AA4XD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAyCvE"}

package/dist/src/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAKjC,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,YAAY,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG/D,YAAY,EAAE,SAAS,EAAE,CAAC;AAC1B,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,CAAC,CAAC;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,IAAI,CAAC;IACV;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAErC;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAEvF;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,EAAE,cAAc,CAAC;IAEvB;;OAEG;IACH,SAAS,EAAE,MAAM,cAAc,GAAG,SAAS,CAAC;IAE5C;;OAEG;IACH,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,KAAK,IAAI,CAAC;CACxD;AAmID;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyMlF"}

package/dist/src/local-callback-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"local-callback-server.d.ts","sourceRoot":"","sources":["../../src/local-callback-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AA2FxE;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC;IACtF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC,CAgFD"}

package/dist/src/oauth-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/oauth-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EACV,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,EACnB,WAAW,EACZ,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CACjD;AAED;;;;;;GAMG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAC3D,OAAO,CAAC,kBAAkB,CAAqC;IAC/D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,qBAAqB,CAAkB;IAE/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAiC;gBAErD,OAAO,EAAE,wBAAwB;IAU7C,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;;OAGG;IACH,IAAI,oBAAoB,IAAI,GAAG,GAAG,SAAS,CAE1C;IAEK,iBAAiB,IAAI,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAIhE,qBAAqB,CAAC,iBAAiB,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnF,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/B,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,IAAI,cAAc,IAAI,mBAAmB,CAKxC;IAED;;;OAGG;IACH,uBAAuB,CAAC,gBAAgB,EAAE,GAAG,GAAG,IAAI;IAI9C,MAAM,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAI1C,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpD;;OAEG;IACH,QAAQ,IAAI,aAAa;IASzB,OAAO,CAAC,kBAAkB;CAK3B;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB,CAE5F"}

package/dist/src/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAEpG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;IAEtC;;;OAGG;IACH,IAAI,EAAE,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,KAAK,IAAI,CAAC;IAEjD;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAElC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,kDAAkD;IAClD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,sDAAsD;IACtD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf"}

package/dist/test/add-cli-tools-to-mcp.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-cli-tools-to-mcp.test.d.ts","sourceRoot":"","sources":["../../test/add-cli-tools-to-mcp.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}