@easynet/agent-tool 1.0.74 → 1.0.75

package/dist/{chunk-SE6IMOIE.cjs → chunk-PYTHEY6A.cjs}

@@ -18,7 +18,7 @@ var pTimeout = require('p-timeout');
 var module$1 = require('module');
 var url = require('url');
 var npm = require('@easynet/agent-common/npm');
-var http = require('http');
+var express = require('express');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -26,7 +26,27 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var Ajv__default = /*#__PURE__*/_interopDefault(Ajv);
 var addFormats__default = /*#__PURE__*/_interopDefault(addFormats);
 var pTimeout__default = /*#__PURE__*/_interopDefault(pTimeout);
+var express__default = /*#__PURE__*/_interopDefault(express);
 
+function normalizeMcpConfig(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const source = raw;
+  const out = {};
+  if (typeof source.name === "string" && source.name.trim()) out.name = source.name.trim();
+  if (typeof source.version === "string" && source.version.trim()) out.version = source.version.trim();
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function normalizeOpenApiConfig(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const source = raw;
+  const out = {};
+  if (typeof source.host === "string" && source.host.trim()) out.host = source.host.trim();
+  if (typeof source.basePath === "string") out.basePath = source.basePath;
+  if (typeof source.title === "string" && source.title.trim()) out.title = source.title.trim();
+  if (typeof source.version === "string" && source.version.trim()) out.version = source.version.trim();
+  if (typeof source.port === "number" && Number.isFinite(source.port)) out.port = source.port;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function loadToolConfig(toolYamlPath) {
   const abs = path.resolve(toolYamlPath);
   const raw = fs.readFileSync(abs, "utf8");
@@ -35,6 +55,8 @@ function loadToolConfig(toolYamlPath) {
   });
   if (!parsed || typeof parsed !== "object") return {};
   const source = parsed.spec && typeof parsed.spec === "object" && !Array.isArray(parsed.spec) ? parsed.spec : parsed;
+  const mcpConfig = normalizeMcpConfig(source.expose?.mcp ?? source.mcp);
+  const openApiConfig = normalizeOpenApiConfig(source.expose?.openapi ?? source.openapi);
   const toolsBlock = source.tools;
   if (toolsBlock != null && typeof toolsBlock === "object" && !Array.isArray(toolsBlock)) {
     const toolDefaults = toolsBlock.defaults != null && typeof toolsBlock.defaults === "object" && !Array.isArray(toolsBlock.defaults) ? toolsBlock.defaults : void 0;
@@ -48,7 +70,9 @@ function loadToolConfig(toolYamlPath) {
       blockedHosts: Array.isArray(toolsBlock.blockedHosts) ? toolsBlock.blockedHosts : source.blockedHosts,
       blockedCidrs: Array.isArray(toolsBlock.blockedCidrs) ? toolsBlock.blockedCidrs : source.blockedCidrs,
       toolDefaults,
-      packageToolDefaults: packageToolDefaults2
+      packageToolDefaults: packageToolDefaults2,
+      mcp: mcpConfig,
+      openapi: openApiConfig
     };
   }
   const packageToolDefaults = typeof source.packageToolDefaults === "object" && !Array.isArray(source.packageToolDefaults) ? source.packageToolDefaults : void 0;
@@ -61,7 +85,9 @@ function loadToolConfig(toolYamlPath) {
     blockedHosts: Array.isArray(source.blockedHosts) ? source.blockedHosts : void 0,
     blockedCidrs: Array.isArray(source.blockedCidrs) ? source.blockedCidrs : void 0,
     toolDefaults: typeof source.toolDefaults === "object" && !Array.isArray(source.toolDefaults) ? source.toolDefaults : void 0,
-    packageToolDefaults
+    packageToolDefaults,
+    mcp: mcpConfig,
+    openapi: openApiConfig
   };
 }
 function resolveSandboxedPath(toolYamlPath, sandboxedPath) {
@@ -1727,7 +1753,7 @@ function buildInputSchemaHint(inputSchema) {
   if (names.length === 0) return null;
   return `This tool expects input property ${names.length === 1 ? `'${names[0]}'` : `one of [${names.map((n) => `'${n}'`).join(", ")}]`}. Use the exact property names from the tool schema.`;
 }
-var requireFromPackage = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-SE6IMOIE.cjs', document.baseURI).href)));
+var requireFromPackage = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-PYTHEY6A.cjs', document.baseURI).href)));
 function getProjectRequire() {
   const cwd = process.cwd();
   if (fs.existsSync(path.join(cwd, "package.json"))) return module$1.createRequire(path.join(cwd, "package.json"));
@@ -1893,7 +1919,7 @@ function parseNpmDescriptor(entry) {
 }
 
 // src/api/runtimeFromConfig.ts
-var requireFromPackage2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-SE6IMOIE.cjs', document.baseURI).href)));
+var requireFromPackage2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-PYTHEY6A.cjs', document.baseURI).href)));
 var DEFAULT_EXTENSION_PACKAGES = [];
 function resolveFileDescriptorPath(descriptor, configFilePath) {
   const parsed = parseToolPath(descriptor.trim());
@@ -2204,6 +2230,137 @@ async function createRuntimeFromConfig(options = {}) {
   return createRuntimeFromConfigSync(options);
 }
 
+// src/api/expose/mcpServer.ts
+var DEFAULT_CTX = {
+  requestId: `mcp-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
+  taskId: `task-${Date.now()}`,
+  permissions: [
+    "read:web",
+    "read:fs",
+    "write:fs",
+    "read:db",
+    "write:db",
+    "network",
+    "workflow",
+    "danger:destructive"
+  ]
+};
+function toMcpToolName(registryName) {
+  return chunkQEJF3KDV_cjs.normalizeToolName(registryName);
+}
+async function createMcpServerWithTools(runtime, options) {
+  const { McpServer } = await import('@modelcontextprotocol/sdk/server/mcp.js');
+  const name = options.name ?? "agent-tool";
+  const version = options.version ?? "1.0.0";
+  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX }));
+  const server = new McpServer({ name, version });
+  const registry = runtime.getRegistry();
+  const specs = registry.snapshot();
+  for (const spec of specs) {
+    const mcpName = toMcpToolName(spec.name);
+    server.registerTool(
+      mcpName,
+      {
+        description: spec.description ?? `Tool: ${spec.name}`,
+        inputSchema: spec.inputSchema,
+        _meta: spec._meta
+      },
+      async (args) => {
+        const ctx = ctxFactory();
+        const result = await runtime.invoke(
+          { tool: spec.name, args: args ?? {}, purpose: chunk33N4Y6IS_cjs.MCP_KIND },
+          ctx
+        );
+        if (result.ok) {
+          return { content: [{ type: "text", text: JSON.stringify(result.result) }] };
+        }
+        const err = result.error;
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({ error: err?.message ?? "Tool failed", kind: err?.kind })
+            }
+          ],
+          isError: true
+        };
+      }
+    );
+  }
+  return { server };
+}
+async function createMCPServer(runtimeOrConfig, options = {}) {
+  const runtime = "invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function" ? runtimeOrConfig : (await createRuntimeFromConfig(runtimeOrConfig)).runtime;
+  const { StdioServerTransport } = await import('@modelcontextprotocol/sdk/server/stdio.js');
+  const { server } = await createMcpServerWithTools(runtime, options);
+  return {
+    server,
+    async connectStdio() {
+      const transport = new StdioServerTransport();
+      await server.connect(transport);
+    }
+  };
+}
+function createMCPStreamableHttpHandler(runtimeOrConfig, options = {}) {
+  if ("invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function") {
+    const runtime = runtimeOrConfig;
+    return async function streamableHttpHandler(req, res, parsedBody) {
+      const { StreamableHTTPServerTransport } = await import('@modelcontextprotocol/sdk/server/streamableHttp.js');
+      const { server } = await createMcpServerWithTools(runtime, options);
+      const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: void 0 });
+      await server.connect(transport);
+      const onClose = () => {
+        transport.close().catch(() => {
+        });
+        server.close().catch(() => {
+        });
+        res.removeListener("close", onClose);
+        res.removeListener("finish", onClose);
+      };
+      res.once("close", onClose);
+      res.once("finish", onClose);
+      await transport.handleRequest(
+        req,
+        res,
+        parsedBody
+      );
+    };
+  }
+  return (async () => {
+    const { runtime } = await createRuntimeFromConfig(runtimeOrConfig);
+    return createMCPStreamableHttpHandler(runtime, options);
+  })();
+}
+async function createMCPServerStreamableHttp(runtimeOrConfig, options = {}) {
+  const path = options.path ?? "/mcp";
+  const host = options.host ?? "127.0.0.1";
+  const port = options.port ?? 3e3;
+  const { createMcpExpressApp } = await import('@modelcontextprotocol/sdk/server/express.js');
+  const handler = "invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function" ? createMCPStreamableHttpHandler(runtimeOrConfig, options) : await createMCPStreamableHttpHandler(runtimeOrConfig, options);
+  const app = createMcpExpressApp({ host });
+  app.post(path, handler);
+  return {
+    app,
+    path,
+    async listen(listenPort, listenHost) {
+      const p = listenPort ?? port;
+      const h = listenHost ?? host;
+      return new Promise((resolve4, reject) => {
+        const server = app.listen(p, h, () => {
+          const addr = server.address();
+          const actualPort = typeof addr === "object" && addr !== null && "port" in addr ? addr.port : p;
+          resolve4({ url: `http://${h}:${actualPort}${path}`, port: actualPort });
+        });
+      });
+    }
+  };
+}
+async function runMCPServerOverStdio(runtime, options = {}) {
+  const result = await createMCPServer(runtime, options);
+  await result.connectStdio();
+  return result;
+}
+
 // src/api/expose/openapi.ts
 function toolNameToSlug(name) {
   return name.replace(/\./g, "~");
@@ -2341,7 +2498,7 @@ function createPerToolPathSpec(spec, key) {
 }
 
 // src/api/expose/openapiHttp.ts
-var DEFAULT_CTX = {
+var DEFAULT_CTX2 = {
   requestId: `http-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
   taskId: `task-${Date.now()}`,
   permissions: [
@@ -2355,8 +2512,17 @@ var DEFAULT_CTX = {
     "danger:destructive"
   ]
 };
+var BodyParseError = class extends Error {
+  hint;
+  constructor(message, hint) {
+    super(message);
+    this.name = "BodyParseError";
+    this.hint = hint;
+  }
+};
 function safeParseToolArgs(raw) {
   const text = String(raw ?? "").trim();
+  if (!text) return { ok: true, value: {} };
   const firstBrace = text.indexOf("{");
   if (firstBrace === -1) {
     return {
@@ -2366,9 +2532,7 @@ function safeParseToolArgs(raw) {
   }
   let jsonText = text.slice(firstBrace);
   const lastBrace = jsonText.lastIndexOf("}");
-  if (lastBrace !== -1) {
-    jsonText = jsonText.slice(0, lastBrace + 1);
-  }
+  if (lastBrace !== -1) jsonText = jsonText.slice(0, lastBrace + 1);
   try {
     return { ok: true, value: JSON.parse(jsonText) };
   } catch {
@@ -2378,37 +2542,8 @@ function safeParseToolArgs(raw) {
     };
   }
 }
-var BodyParseError = class extends Error {
-  hint;
-  constructor(message, hint) {
-    super(message);
-    this.name = "BodyParseError";
-    this.hint = hint;
-  }
-};
-function parseBody(req) {
-  return new Promise((resolve4, reject) => {
-    const chunks = [];
-    req.on("data", (chunk) => chunks.push(chunk));
-    req.on("end", () => {
-      const raw = Buffer.concat(chunks).toString("utf-8");
-      if (!raw.trim()) {
-        resolve4({});
-        return;
-      }
-      const parsed = safeParseToolArgs(raw);
-      if (parsed.ok) {
-        resolve4(parsed.value);
-        return;
-      }
-      reject(new BodyParseError("Invalid JSON body", parsed.hint));
-    });
-    req.on("error", reject);
-  });
-}
 function sendJson(res, status, data) {
-  res.writeHead(status, { "Content-Type": "application/json" });
-  res.end(JSON.stringify(data));
+  res.status(status).json(data);
 }
 function swaggerUiHtml(specUrl) {
   const specUrlEscaped = specUrl.replace(/"/g, """);
@@ -2441,99 +2576,13 @@ function swaggerUiHtml(specUrl) {
 </body>
 </html>`;
 }
-function createOpenAPIHttpServer(runtime, options = {}) {
-  const basePath = (options.basePath ?? "").replace(/\/$/, "");
-  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX }));
-  const server = http.createServer(
-    (req, res) => handleOpenApiHttpRequest({ runtime, req, res, basePath, ctxFactory })
-  );
-  return server;
-}
-async function handleOpenApiHttpRequest(input) {
-  const norm = normalizePath(input.req.url, input.basePath);
-  try {
-    if (await maybeHandleDocsRoute(input, norm)) return;
-    if (await maybeHandleToolsRoute(input, norm)) return;
-    if (await maybeHandleInvokeRoute(input, norm)) return;
-    sendJson(input.res, 404, { error: "Not found", path: norm });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    sendJson(input.res, 500, { error: message, kind: "INTERNAL_ERROR" });
-  }
-}
-function normalizePath(url, basePath) {
-  const path = (url ?? "/").split("?")[0] ?? "/";
-  return basePath ? path === basePath ? "" : path.replace(basePath, "") || "/" : path;
-}
-async function maybeHandleDocsRoute(input, norm) {
-  if (input.req.method === "GET" && (norm === "/" || norm === "/swagger")) {
-    const specPath = input.basePath ? `${input.basePath}/openapi.json` : "/openapi.json";
-    input.res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-    input.res.end(swaggerUiHtml(specPath));
-    return true;
-  }
-  if (input.req.method === "GET" && (norm === "/openapi.json" || norm === "/spec")) {
-    sendJson(
-      input.res,
-      200,
-      toolsToOpenAPISpec(input.runtime.getRegistry(), {
-        title: "Tool API",
-        version: "1.0.0",
-        basePath: input.basePath || void 0
-      })
-    );
-    return true;
-  }
-  return false;
-}
-async function maybeHandleToolsRoute(input, norm) {
-  if (input.req.method !== "GET" || norm !== "/tools") return false;
-  const { enrichSpecWithCanonicalSchema: enrichSpecWithCanonicalSchema2 } = await import('./canonicalCoreSchemas-TY7NCWCC.cjs');
-  const tools = input.runtime.getRegistry().snapshot().map(enrichSpecWithCanonicalSchema2).map((s) => ({
-    name: s.name,
-    description: s.description,
-    kind: s.kind,
-    inputSchema: s.inputSchema
-  }));
-  sendJson(input.res, 200, { tools });
-  return true;
-}
-async function maybeHandleInvokeRoute(input, norm) {
-  if (input.req.method !== "POST") return false;
-  if (norm === "/invoke") {
-    const body = await parseBodyOrSendError(input.req, input.res);
-    if (!body) return true;
-    const tool = body.tool;
-    if (typeof tool !== "string" || !tool.trim()) {
-      sendJson(input.res, 400, { error: "Missing or invalid 'tool' in body", kind: "BAD_REQUEST" });
-      return true;
-    }
-    await invokeAndSend(input.runtime, input.ctxFactory(input.req), input.res, tool.trim(), body.args ?? {});
-    return true;
-  }
-  if (norm.startsWith("/invoke/") && norm.length > "/invoke/".length) {
-    const args = await parseArgsOrSendError(input.req, input.res);
-    if (args === void 0) return true;
-    await invokeAndSend(input.runtime, input.ctxFactory(input.req), input.res, slugToToolName(norm.slice(8)), args);
-    return true;
-  }
-  return false;
-}
-async function parseBodyOrSendError(req, res) {
-  try {
-    return await parseBody(req);
-  } catch (err) {
-    sendBadJsonBody(res, err);
-    return null;
-  }
-}
-async function parseArgsOrSendError(req, res) {
-  try {
-    return await parseBody(req) ?? {};
-  } catch (err) {
-    sendBadJsonBody(res, err);
-    return void 0;
-  }
+function parseBodyFromExpress(raw) {
+  if (raw == null) return {};
+  if (typeof raw === "object") return raw;
+  const text = Buffer.isBuffer(raw) ? raw.toString("utf-8") : String(raw);
+  const parsed = safeParseToolArgs(text);
+  if (parsed.ok) return parsed.value;
+  throw new BodyParseError("Invalid JSON body", parsed.hint);
 }
 function sendBadJsonBody(res, err) {
   const hint = err instanceof BodyParseError ? err.hint : void 0;
@@ -2556,16 +2605,117 @@ async function invokeAndSend(runtime, ctx, res, tool, args) {
     details: result.error?.details
   });
 }
-function listenOpenAPIHttpServer(server, options = {}) {
+function createOpenAPIHttpServer(runtime, options = {}) {
+  const app = express__default.default();
+  const router = express__default.default.Router();
+  const basePath = (options.basePath ?? "").replace(/\/$/, "");
+  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX2 }));
+  app.use(express__default.default.text({ type: "*/*" }));
+  router.get("/", (_req, res) => {
+    const specPath = basePath ? `${basePath}/openapi.json` : "/openapi.json";
+    res.type("text/html; charset=utf-8").send(swaggerUiHtml(specPath));
+  });
+  router.get("/swagger", (_req, res) => {
+    const specPath = basePath ? `${basePath}/openapi.json` : "/openapi.json";
+    res.type("text/html; charset=utf-8").send(swaggerUiHtml(specPath));
+  });
+  router.get("/openapi.json", (_req, res) => {
+    sendJson(
+      res,
+      200,
+      toolsToOpenAPISpec(runtime.getRegistry(), {
+        title: "Tool API",
+        version: "1.0.0",
+        basePath: basePath || void 0
+      })
+    );
+  });
+  router.get("/spec", (_req, res) => {
+    sendJson(
+      res,
+      200,
+      toolsToOpenAPISpec(runtime.getRegistry(), {
+        title: "Tool API",
+        version: "1.0.0",
+        basePath: basePath || void 0
+      })
+    );
+  });
+  router.get("/tools", async (_req, res, next) => {
+    try {
+      const { enrichSpecWithCanonicalSchema: enrichSpecWithCanonicalSchema2 } = await import('./canonicalCoreSchemas-TY7NCWCC.cjs');
+      const tools = runtime.getRegistry().snapshot().map(enrichSpecWithCanonicalSchema2).map((s) => ({
+        name: s.name,
+        description: s.description,
+        kind: s.kind,
+        inputSchema: s.inputSchema
+      }));
+      sendJson(res, 200, { tools });
+    } catch (error) {
+      next(error);
+    }
+  });
+  router.post("/invoke", async (req, res) => {
+    let body = null;
+    try {
+      body = parseBodyFromExpress(req.body);
+    } catch (err) {
+      sendBadJsonBody(res, err);
+      return;
+    }
+    const tool = body.tool;
+    if (typeof tool !== "string" || !tool.trim()) {
+      sendJson(res, 400, { error: "Missing or invalid 'tool' in body", kind: "BAD_REQUEST" });
+      return;
+    }
+    await invokeAndSend(runtime, ctxFactory(req), res, tool.trim(), body.args ?? {});
+  });
+  router.post("/invoke/:slug", async (req, res) => {
+    let args;
+    try {
+      args = parseBodyFromExpress(req.body);
+    } catch (err) {
+      sendBadJsonBody(res, err);
+      return;
+    }
+    await invokeAndSend(runtime, ctxFactory(req), res, slugToToolName(req.params?.slug ?? ""), args);
+  });
+  if (basePath) {
+    app.use(basePath, router);
+  } else {
+    app.use(router);
+  }
+  app.use((req, res) => {
+    sendJson(res, 404, { error: "Not found", path: req.url ?? "/" });
+  });
+  app.use((err, _req, res, _next) => {
+    const message = err instanceof Error ? err.message : String(err);
+    sendJson(res, 500, { error: message, kind: "INTERNAL_ERROR" });
+  });
+  const originalListen = app.listen.bind(app);
+  const defaultPort = options.port;
+  const defaultHost = options.host;
+  app.listen = ((...args) => {
+    if (args.length === 0) {
+      return originalListen(defaultPort ?? 0, defaultHost ?? "localhost");
+    }
+    if (args.length === 1 && typeof args[0] === "function") {
+      return originalListen(defaultPort ?? 0, defaultHost ?? "localhost", args[0]);
+    }
+    return originalListen(...args);
+  });
+  return app;
+}
+function listenOpenAPIHttpServer(app, options = {}) {
   return new Promise((resolve4, reject) => {
     const port = options.port ?? 0;
     const host = options.host ?? "localhost";
-    server.listen(port, host, () => {
-      const addr = server.address();
+    const httpServer = app.listen(port, host, () => {
+      const addr = httpServer.address();
       const actualPort = typeof addr === "object" && addr?.port != null ? addr.port : port;
-      resolve4({ port: actualPort, host });
+      resolve4({ port: actualPort, host, httpServer });
     });
-    server.on("error", reject);
+    httpServer.on("error", reject);
   });
 }
 async function createHttpService(runtimeOrConfig, options = {}) {
@@ -2576,149 +2726,31 @@ async function createHttpService(runtimeOrConfig, options = {}) {
     version: options.version ?? "1.0.0",
     basePath: options.basePath
   });
+  let activeHttpServer = null;
   return {
     server,
     openApiSpec,
-    listen: (listenOpts) => listenOpenAPIHttpServer(server, listenOpts)
-  };
-}
-
-// src/api/expose/mcpServer.ts
-var DEFAULT_CTX2 = {
-  requestId: `mcp-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
-  taskId: `task-${Date.now()}`,
-  permissions: [
-    "read:web",
-    "read:fs",
-    "write:fs",
-    "read:db",
-    "write:db",
-    "network",
-    "workflow",
-    "danger:destructive"
-  ]
-};
-function toMcpToolName(registryName) {
-  return chunkQEJF3KDV_cjs.normalizeToolName(registryName);
-}
-async function createMcpServerWithTools(runtime, options) {
-  const { McpServer } = await import('@modelcontextprotocol/sdk/server/mcp.js');
-  const name = options.name ?? "agent-tool";
-  const version = options.version ?? "1.0.0";
-  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX2 }));
-  const server = new McpServer({ name, version });
-  const registry = runtime.getRegistry();
-  const specs = registry.snapshot();
-  for (const spec of specs) {
-    const mcpName = toMcpToolName(spec.name);
-    server.registerTool(
-      mcpName,
-      {
-        description: spec.description ?? `Tool: ${spec.name}`,
-        inputSchema: spec.inputSchema,
-        _meta: spec._meta
-      },
-      async (args) => {
-        const ctx = ctxFactory();
-        const result = await runtime.invoke(
-          { tool: spec.name, args: args ?? {}, purpose: chunk33N4Y6IS_cjs.MCP_KIND },
-          ctx
-        );
-        if (result.ok) {
-          return { content: [{ type: "text", text: JSON.stringify(result.result) }] };
-        }
-        const err = result.error;
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({ error: err?.message ?? "Tool failed", kind: err?.kind })
-            }
-          ],
-          isError: true
-        };
-      }
-    );
-  }
-  return { server };
-}
-async function createMCPServer(runtimeOrConfig, options = {}) {
-  const runtime = "invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function" ? runtimeOrConfig : (await createRuntimeFromConfig(runtimeOrConfig)).runtime;
-  const { StdioServerTransport } = await import('@modelcontextprotocol/sdk/server/stdio.js');
-  const { server } = await createMcpServerWithTools(runtime, options);
-  return {
-    server,
-    async connectStdio() {
-      const transport = new StdioServerTransport();
-      await server.connect(transport);
-    }
-  };
-}
-function createMCPStreamableHttpHandler(runtimeOrConfig, options = {}) {
-  if ("invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function") {
-    const runtime = runtimeOrConfig;
-    return async function streamableHttpHandler(req, res, parsedBody) {
-      const { StreamableHTTPServerTransport } = await import('@modelcontextprotocol/sdk/server/streamableHttp.js');
-      const { server } = await createMcpServerWithTools(runtime, options);
-      const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: void 0 });
-      await server.connect(transport);
-      const onClose = () => {
-        transport.close().catch(() => {
-        });
-        server.close().catch(() => {
-        });
-        res.removeListener("close", onClose);
-        res.removeListener("finish", onClose);
-      };
-      res.once("close", onClose);
-      res.once("finish", onClose);
-      await transport.handleRequest(
-        req,
-        res,
-        parsedBody
-      );
-    };
-  }
-  return (async () => {
-    const { runtime } = await createRuntimeFromConfig(runtimeOrConfig);
-    return createMCPStreamableHttpHandler(runtime, options);
-  })();
-}
-async function createMCPServerStreamableHttp(runtimeOrConfig, options = {}) {
-  const path = options.path ?? "/mcp";
-  const host = options.host ?? "127.0.0.1";
-  const port = options.port ?? 3e3;
-  const { createMcpExpressApp } = await import('@modelcontextprotocol/sdk/server/express.js');
-  const handler = "invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function" ? createMCPStreamableHttpHandler(runtimeOrConfig, options) : await createMCPStreamableHttpHandler(runtimeOrConfig, options);
-  const app = createMcpExpressApp({ host });
-  app.post(path, handler);
-  return {
-    app,
-    path,
-    async listen(listenPort, listenHost) {
-      const p = listenPort ?? port;
-      const h = listenHost ?? host;
-      return new Promise((resolve4, reject) => {
-        const server = app.listen(p, h, () => {
-          const addr = server.address();
-          const actualPort = typeof addr === "object" && addr !== null && "port" in addr ? addr.port : p;
-          resolve4({ url: `http://${h}:${actualPort}${path}`, port: actualPort });
-        });
+    listen: async (listenOpts) => {
+      const { port, host, httpServer } = await listenOpenAPIHttpServer(server, listenOpts);
+      activeHttpServer = httpServer;
+      return { port, host };
+    },
+    close: async () => {
+      if (!activeHttpServer) return;
+      await new Promise((resolve4, reject) => {
+        activeHttpServer.close((err) => err ? reject(err) : resolve4());
       });
+      activeHttpServer = null;
     }
   };
 }
-async function runMCPServerOverStdio(runtime, options = {}) {
-  const result = await createMCPServer(runtime, options);
-  await result.connectStdio();
-  return result;
-}
 
 exports.PTCRuntime = PTCRuntime;
 exports.createHttpService = createHttpService;
 exports.createMCPServer = createMCPServer;
 exports.createMCPServerStreamableHttp = createMCPServerStreamableHttp;
 exports.createMCPStreamableHttpHandler = createMCPStreamableHttpHandler;
+exports.createOpenAPIHttpServer = createOpenAPIHttpServer;
 exports.createRuntimeFromConfig = createRuntimeFromConfig;
 exports.createRuntimeFromConfigSync = createRuntimeFromConfigSync;
 exports.expandToolDescriptorsToRegistryNames = expandToolDescriptorsToRegistryNames;
@@ -2731,5 +2763,5 @@ exports.npmDescriptorToPackagePrefixWithVersion = npmDescriptorToPackagePrefixWi
 exports.resolveSandboxedPath = resolveSandboxedPath;
 exports.resolveToolDescriptor = resolveToolDescriptor;
 exports.runMCPServerOverStdio = runMCPServerOverStdio;
-//# sourceMappingURL=chunk-SE6IMOIE.cjs.map
-//# sourceMappingURL=chunk-SE6IMOIE.cjs.map
+//# sourceMappingURL=chunk-PYTHEY6A.cjs.map
+//# sourceMappingURL=chunk-PYTHEY6A.cjs.map