@olane/o-mcp 0.6.13 → 0.7.1

package/dist/src/mcp-bridge.tool.d.ts

@@ -1,13 +1,16 @@
-import { oToolConfig, oVirtualTool, ToolResult } from '@olane/o-tool';
+import { ToolResult } from '@olane/o-tool';
 import { oRequest } from '@olane/o-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { McpTool } from './mcp.tool.js';
-export declare class McpBridgeTool extends oVirtualTool {
-    constructor(config: oToolConfig);
+import { oLaneTool } from '@olane/o-lane';
+import { oNodeToolConfig } from '@olane/o-node';
+export declare class McpBridgeTool extends oLaneTool {
+    private addedRemoteServers;
+    constructor(config: oNodeToolConfig);
     _tool_validate_url(request: oRequest): Promise<ToolResult>;
     _tool_add_remote_server(request: oRequest): Promise<ToolResult>;
     _tool_add_local_server(request: oRequest): Promise<ToolResult>;
     _tool_search(request: oRequest): Promise<ToolResult>;
-    createMcpTool(mcpClient: Client, url: string, name?: string): Promise<McpTool>;
+    createMcpTool(mcpClient: Client, url: string, name?: string, description?: string): Promise<McpTool>;
 }
 //# sourceMappingURL=mcp-bridge.tool.d.ts.map

package/dist/src/mcp-bridge.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-bridge.tool.d.ts","sourceRoot":"","sources":["../../src/mcp-bridge.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAY,QAAQ,EAAc,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,qBAAa,aAAc,SAAQ,YAAY;gBACjC,MAAM,EAAE,WAAW;IASzB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAsB1D,uBAAuB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAuC/D,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IA+B9D,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAwBpD,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;CAuBpB"}
+{"version":3,"file":"mcp-bridge.tool.d.ts","sourceRoot":"","sources":["../../src/mcp-bridge.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAY,QAAQ,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,qBAAa,aAAc,SAAQ,SAAS;IAC1C,OAAO,CAAC,kBAAkB,CAA0B;gBAExC,MAAM,EAAE,eAAe;IAU7B,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAsB1D,uBAAuB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAgD/D,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IA+B9D,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAwBpD,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;CAuBpB"}

package/dist/src/mcp-bridge.tool.js

@@ -1,18 +1,19 @@
-import { oVirtualTool } from '@olane/o-tool';
 import { oAddress } from '@olane/o-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { McpTool } from './mcp.tool.js';
 import { MCP_BRIDGE_METHODS } from './methods/mcp-bridge.methods.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-export class McpBridgeTool extends oVirtualTool {
+import { oLaneTool } from '@olane/o-lane';
+export class McpBridgeTool extends oLaneTool {
     constructor(config) {
         super({
             ...config,
             address: new oAddress('o://mcp'),
-            description: 'Tool to help add MCP servers to the network',
+            description: 'Model context protocol (MCP) tool for adding MCP servers to the network',
             methods: MCP_BRIDGE_METHODS,
         });
+        this.addedRemoteServers = new Set();
     }
     async _tool_validate_url(request) {
         const params = request.params;
@@ -37,8 +38,11 @@ export class McpBridgeTool extends oVirtualTool {
     async _tool_add_remote_server(request) {
         const params = request.params;
         // params have already been validated
-        const { mcpServerUrl, headers } = params;
+        const { mcpServerUrl, headers, name, description } = params;
         try {
+            if (this.addedRemoteServers.has(mcpServerUrl)) {
+                throw new Error('MCP server already added: ' + mcpServerUrl);
+            }
             this.logger.debug('Adding MCP server: ' + mcpServerUrl);
             const transport = new StreamableHTTPClientTransport(new URL(mcpServerUrl), {
                 requestInit: {
@@ -51,10 +55,11 @@ export class McpBridgeTool extends oVirtualTool {
                 headers: headers,
             });
             await mcpClient.connect(transport);
-            await this.createMcpTool(mcpClient, mcpServerUrl);
+            await this.createMcpTool(mcpClient, mcpServerUrl, name, description);
+            this.addedRemoteServers.add(mcpServerUrl);
             return {
                 message: 'Successfully added MCP server with ' +
-                    this.childNodes.length +
+                    this.hierarchyManager.getChildren().length +
                     ' tools',
             };
         }
@@ -109,21 +114,21 @@ export class McpBridgeTool extends oVirtualTool {
             result: response.result.data.message,
         };
     }
-    async createMcpTool(mcpClient, url, name) {
+    async createMcpTool(mcpClient, url, name, description) {
         this.logger.debug('Creating MCP tool: ', name, url);
         const mcpTool = new McpTool({
             name: name || 'mcp-' + Date.now(),
-            description: 'MCP server for ' + url,
+            description: description || 'MCP server for ' + url,
             address: new oAddress(`o://${name || `mcp-${Date.now()}`}`),
             mcpClient: mcpClient,
             dependencies: [],
-            leader: this.config.leader,
+            leader: this.leader,
             parent: this.address,
         });
-        this.addChildNode(mcpTool);
-        await this.startChildren();
         await mcpTool.setupTools();
-        await this.use(new oAddress(mcpTool.address.toString()), {
+        await mcpTool.start();
+        this.addChildNode(mcpTool);
+        await this.useChild(mcpTool.address, {
             method: 'index_network',
             params: {},
         });

package/dist/src/mcp.tool.d.ts

@@ -1,15 +1,22 @@
-import { oToolConfig, oVirtualTool } from '@olane/o-tool';
 import { oAddress } from '@olane/o-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-export declare class McpTool extends oVirtualTool {
+import { oLaneTool } from '@olane/o-lane';
+import { oNodeToolConfig } from '@olane/o-node';
+export declare class McpTool extends oLaneTool {
     private mcpClient;
-    constructor(config: oToolConfig & {
+    constructor(config: oNodeToolConfig & {
         address: oAddress;
         mcpClient: Client;
     });
     setupTools(): Promise<void>;
     myTools(): Promise<string[]>;
-    index(): Promise<any>;
+    index(): Promise<{
+        provider: string;
+        summary: string;
+    } | {
+        summary: string | null;
+        provider?: undefined;
+    }>;
     whoami(): Promise<any>;
 }
 //# sourceMappingURL=mcp.tool.d.ts.map

package/dist/src/mcp.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.tool.d.ts","sourceRoot":"","sources":["../../src/mcp.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAyC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGnE,qBAAa,OAAQ,SAAQ,YAAY;IACvC,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,WAAW,GAAG;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE;IAYpE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC3B,OAAO;IAQP,KAAK;IA2BL,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;CAmB7B"}
+{"version":3,"file":"mcp.tool.d.ts","sourceRoot":"","sources":["../../src/mcp.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiC,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,qBAAa,OAAQ,SAAQ,SAAS;IACpC,OAAO,CAAC,SAAS,CAAS;gBAGxB,MAAM,EAAE,eAAe,GAAG;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE;IAa9D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B,OAAO;IAQP,KAAK;;;;;;;IAuBL,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;CAoB7B"}

package/dist/src/mcp.tool.js

@@ -1,7 +1,7 @@
-import { oVirtualTool } from '@olane/o-tool';
-import { oAddress, oToolError, oToolErrorCodes } from '@olane/o-core';
+import { oAddress, oError, oErrorCodes } from '@olane/o-core';
 import { v4 as uuidv4 } from 'uuid';
-export class McpTool extends oVirtualTool {
+import { oLaneTool } from '@olane/o-lane';
+export class McpTool extends oLaneTool {
     constructor(config) {
         super({
             ...config,
@@ -34,12 +34,11 @@ export class McpTool extends oVirtualTool {
                 });
                 this.logger.debug('MCP tool result: ', result);
                 if (result.isError) {
-                    throw new oToolError(oToolErrorCodes.TOOL_ERROR, JSON.stringify(result.content));
+                    throw new oError(oErrorCodes.UNKNOWN, JSON.stringify(result.content));
                 }
                 return result.content;
             };
         });
-        await this.startChildren();
     }
     async myTools() {
         const tools = await this.mcpClient.listTools();
@@ -52,8 +51,8 @@ export class McpTool extends oVirtualTool {
         const result = await super.index();
         // add each mcp tool to the vector store
         const tools = await this.mcpClient.listTools();
-        await Promise.all(tools.tools.map((tool) => {
-            return this.use(new oAddress('o://vector-store'), {
+        for (const tool of tools.tools) {
+            await this.use(new oAddress('o://vector-store'), {
                 method: 'add_documents',
                 params: {
                     documents: [
@@ -67,15 +66,14 @@ export class McpTool extends oVirtualTool {
                     ],
                 },
             });
-        })).catch((err) => {
-            this.logger.error('Error adding MCP tools to vector store: ', err);
-        });
+        }
         return result;
     }
     async whoami() {
         // do nothing
         const tools = await this.mcpClient.listTools();
         return {
+            description: this.description,
             tools: tools.tools.map((tool) => {
                 this.logger.debug('MCP Tool Definition: ', tool.name, tool.description, tool.inputSchema);
                 return {

package/dist/src/methods/mcp-bridge.methods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-bridge.methods.d.ts","sourceRoot":"","sources":["../../../src/methods/mcp-bridge.methods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,eAAO,MAAM,kBAAkB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CA+FxD,CAAC"}
+{"version":3,"file":"mcp-bridge.methods.d.ts","sourceRoot":"","sources":["../../../src/methods/mcp-bridge.methods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,eAAO,MAAM,kBAAkB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CA8GxD,CAAC"}

package/dist/src/methods/mcp-bridge.methods.js

@@ -1,7 +1,7 @@
 export const MCP_BRIDGE_METHODS = {
     validate_url: {
         name: 'validate_url',
-        description: 'Validate if a URL is a valid MCP server or a link to something else.',
+        description: 'Validate the URL of an MCP server',
         dependencies: [],
         parameters: [
             {
@@ -25,6 +25,20 @@ export const MCP_BRIDGE_METHODS = {
                 description: 'The URL of the MCP server to use',
                 required: true,
             },
+            {
+                name: 'name',
+                type: 'string',
+                value: 'string',
+                description: 'The name for the MCP server. Generate this in lowercase snake_case if not provided.',
+                required: true,
+            },
+            {
+                name: 'description',
+                type: 'string',
+                value: 'string',
+                description: 'The description for the MCP server. Generate this if not provided.',
+                required: false,
+            },
             {
                 name: 'headers',
                 type: 'object',

package/dist/src/o-client.mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-client.mcp.d.ts","sourceRoot":"","sources":["../../src/o-client.mcp.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,aAAa,EACd,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAEL,cAAc,EAEf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAC;AAEzE,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG;IAC3C,sFAAsF;IACtF,MAAM,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;CAC5C,CAAC;AAEF,qBAAa,OAAQ,SAAQ,MAAM;IACjC,OAAO,CAAC,cAAc,CAAC,CAAoC;gBAE/C,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,cAAc;IAK3D,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ7E"}
+{"version":3,"file":"o-client.mcp.d.ts","sourceRoot":"","sources":["../../src/o-client.mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,aAAa,EACd,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAC;AAEzE,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG;IAC3C,sFAAsF;IACtF,MAAM,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;CAC5C,CAAC;AAEF,qBAAa,OAAQ,SAAQ,MAAM;IACjC,OAAO,CAAC,cAAc,CAAC,CAAoC;gBAE/C,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,cAAc;IAK3D,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ7E"}

package/dist/test/benchmark.spec.d.ts

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=benchmark.spec.d.ts.map

package/dist/test/benchmark.spec.js

@@ -1,48 +1,49 @@
-import { expect } from 'chai';
-import { GITHUB_TEST_CASES } from './benchmarks/github/github.test-cases.js';
-import { McpBridgeTool } from '../src/index.js';
-import { NodeState } from '@olane/o-core';
-import { IntelligenceTool } from '@olane/o-intelligence';
-import { oLeaderNode } from '@olane/o-leader';
-const leader = new oLeaderNode({
-    parent: null,
-    leader: null,
-});
-const mcpTool = new McpBridgeTool({
-    parent: null,
-    leader: null,
-});
-leader.addChildNode(mcpTool);
-const intelligenceTool = new IntelligenceTool({
-    parent: mcpTool.address,
-    leader: mcpTool.address,
-});
-leader.addChildNode(intelligenceTool);
-describe('o-mcp start node', () => {
-    it('should be able to start a node', async () => {
-        await leader.start();
-        expect(mcpTool.state).to.equal(NodeState.RUNNING);
-    });
-});
-describe('o-mcp github-benchmarks', () => {
-    it('should be able to test github benchmarks', async () => {
-        for (const testCase of GITHUB_TEST_CASES) {
-            console.log(testCase.input);
-            const handshakeResponse = await mcpTool.use(mcpTool.address, {
-                method: 'handshake',
-                params: {
-                    intent: testCase.input,
-                },
-            });
-            console.log(handshakeResponse.result.data);
-            // const result = await testCase.output;
-            // expect(result).to.contain(testCase.output.contains);
-        }
-    });
-});
-describe('o-mcp stop node', () => {
-    it('should be able to stop a node', async () => {
-        await leader.stop();
-        expect(mcpTool.state).to.equal(NodeState.STOPPED);
-    });
-});
+"use strict";
+// import { expect } from 'chai';
+// import { GITHUB_TEST_CASES } from './benchmarks/github/github.test-cases.js';
+// import { McpBridgeTool } from '../src/index.js';
+// import { NodeState, oAddress } from '@olane/o-core';
+// import { IntelligenceTool } from '@olane/o-intelligence';
+// import { oLeaderNode } from '@olane/o-leader';
+// const leader = new oLeaderNode({
+//   parent: null,
+//   leader: null,
+// });
+// const mcpTool = new McpBridgeTool({
+//   parent: null,
+//   leader: null,
+// });
+// leader.addChildNode(mcpTool);
+// const intelligenceTool = new IntelligenceTool({
+//   parent: mcpTool.address,
+//   leader: mcpTool.address,
+// });
+// leader.addChildNode(intelligenceTool);
+// describe('o-mcp start node', () => {
+//   it('should be able to start a node', async () => {
+//     await leader.start();
+//     expect(mcpTool.state).to.equal(NodeState.RUNNING);
+//   });
+// });
+// describe('o-mcp github-benchmarks', () => {
+//   it('should be able to test github benchmarks', async () => {
+//     for (const testCase of GITHUB_TEST_CASES) {
+//       console.log(testCase.input);
+//       const handshakeResponse = await mcpTool.use(mcpTool.address, {
+//         method: 'handshake',
+//         params: {
+//           intent: testCase.input,
+//         },
+//       });
+//       console.log(handshakeResponse.result.data);
+//       // const result = await testCase.output;
+//       // expect(result).to.contain(testCase.output.contains);
+//     }
+//   });
+// });
+// describe('o-mcp stop node', () => {
+//   it('should be able to stop a node', async () => {
+//     await leader.stop();
+//     expect(mcpTool.state).to.equal(NodeState.STOPPED);
+//   });
+// });

package/dist/test/tools.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tools.spec.d.ts.map

package/dist/test/tools.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tools.spec.d.ts","sourceRoot":"","sources":["../../test/tools.spec.ts"],"names":[],"mappings":""}

package/dist/test/tools.spec.js

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { McpBridgeTool } from '../src/index.js';
+const mcpTool = new McpBridgeTool({
+    parent: null,
+    leader: null,
+});
+describe('o-mcp verify myTools works', () => {
+    it('should be able to stop a node', async () => {
+        const tools = await mcpTool.myTools();
+        console.log(tools);
+        expect(tools.length).to.be.greaterThan(0);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-mcp",
-  "version": "0.6.13",
+  "version": "0.7.1",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -56,13 +56,14 @@
     "typescript": "5.4.5"
   },
   "peerDependencies": {
-    "@modelcontextprotocol/sdk": "^1.13.0",
-    "@olane/o-config": "^0.6.12",
-    "@olane/o-core": "^0.6.12",
-    "@olane/o-intelligence": "^0.6.7",
-    "@olane/o-leader": "^0.6.12",
-    "@olane/o-protocol": "^0.6.12",
-    "@olane/o-tool": "^0.6.12"
+    "@modelcontextprotocol/sdk": "^1.18.1",
+    "@olane/o-config": "^0.7.0",
+    "@olane/o-core": "^0.7.0",
+    "@olane/o-intelligence": "^0.7.0",
+    "@olane/o-leader": "^0.7.0",
+    "@olane/o-protocol": "^0.7.0",
+    "@olane/o-tool": "^0.7.0",
+    "@olane/o-lane": "^0.7.0"
   },
   "dependencies": {
     "debug": "^4.4.1",