apps 0.0.1-beta.7 → 0.0.1-beta.70

package/js/mcp.js

@@ -1,55 +1,62 @@
 import {
-  mcpClientEffect
-} from "./chunk-OCYUEU47.js";
+  mcpClientEffect,
+  mcpHealthEffect
+} from "./chunk-M5OLYYNU.js";
 import {
-  catalogCache
-} from "./chunk-RFVIONFX.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-ECCWT5GJ.js";
 import {
   adaptMcpTool
-} from "./chunk-CMYUWAX7.js";
+} from "./chunk-WGQP62EG.js";
 import {
   protocolOperations
-} from "./chunk-72JNVHPK.js";
+} from "./chunk-WDIVWSDG.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-UESPOTUI.js";
+import "./chunk-2YSTJMBD.js";
 import {
   cacheKey
-} from "./chunk-NKLWZJLE.js";
-import "./chunk-FL2QR3XW.js";
-import "./chunk-IPI4MFSN.js";
-import "./chunk-YXQHV65J.js";
-import "./chunk-ZQINWV4W.js";
+} from "./chunk-RUP4JMKO.js";
+import {
+  operationDescription
+} from "./chunk-4NCIPADO.js";
+import "./chunk-MHB7IFG7.js";
+import "./chunk-XBG7HHXC.js";
+import "./chunk-3R3KFCDU.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-Z5M2LQOZ.js";
-import "./chunk-MKWZPDR6.js";
+} from "./chunk-ZEJ3IKEC.js";
+import {
+  fromPromise,
+  method
+} from "./chunk-ZR7QAG67.js";
 import {
+  McpCredentialsUnverified,
   McpError,
   McpServerHeader,
   McpToolMetadata,
   McpToolsOptions
-} from "./chunk-WLE7WX2U.js";
-import "./chunk-N7YDVXYJ.js";
-import "./chunk-R3EV5FTO.js";
-import "./chunk-JU7VHODU.js";
-import "./chunk-RJDDBDSN.js";
-import "./chunk-57RKNWL2.js";
-import "./chunk-UK573G7W.js";
-import "./chunk-5T57N25Q.js";
-import "./chunk-PZB6T6KU.js";
-import "./chunk-27F7W2LG.js";
+} from "./chunk-JW5LYSER.js";
+import "./chunk-7LMU3ER3.js";
+import "./chunk-H72MEDMN.js";
+import "./chunk-KGCTYL2S.js";
+import "./chunk-3CVQ3VPP.js";
+import "./chunk-PD6I2SDG.js";
+import "./chunk-5FHWNLCI.js";
+import "./chunk-H2CJWXA3.js";
+import "./chunk-TUMGL2OC.js";
+import "./chunk-EOPQ727L.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-IFJU5SYQ.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/implementation/mcp-catalog.ts
 var McpToolSummary = McpToolMetadata.mapFields(
   ({ inputSchema: _input, outputSchema: _output, _meta, ...fields }) => fields
 );
-var invoke = (work) => Effect_exports.tryPromise({ try: work, catch: (error) => error });
 var serverMeta = (server) => {
   const title = server.title ?? server.name;
   return {
@@ -60,20 +67,22 @@ var serverMeta = (server) => {
   };
 };
 var mcpCatalog = (options, kinds) => Effect_exports.gen(function* () {
-  const parsed = yield* Schema_exports.decodeUnknownEffect(McpToolsOptions)(options).pipe(
-    Effect_exports.mapError(() => new McpError({ phase: "connect", reason: "invalid_input" }))
-  );
-  const headers = {};
-  new Headers(parsed.headers).forEach((value, name) => {
-    headers[name] = value;
-  });
-  const id = yield* cacheKey({ url: parsed.url, headers, accountId: parsed.accountId ?? null });
+  const invalid = () => new McpError({ phase: "connect", reason: "invalid_input" });
+  const parsed = yield* Schema_exports.decodeUnknownEffect(McpToolsOptions)({
+    url: options.url,
+    accountId: options.account?.id,
+    headers: options.headers,
+    signal: options.signal,
+    timeoutMs: options.timeoutMs
+  }).pipe(Effect_exports.mapError(invalid));
+  const cache = yield* catalogScope(options, options.headers, invalid);
+  const id = yield* cacheKey({ url: parsed.url });
   const key = ["mcp-catalog-v3", id, "current"];
-  const cache = options.cache;
-  const changed = cache === void 0 ? void 0 : invoke(() => cache.invalidate(key));
-  const client = yield* mcpClientEffect(options, changed);
+  const changed = cache === void 0 ? void 0 : fromPromise(method(cache, "invalidate"), "cache")(key);
+  const client = yield* mcpClientEffect(parsed, changed);
   const catalog = yield* catalogCache({
     ...options,
+    cache,
     prefix: ["mcp-catalog-v3", id],
     schema: McpToolMetadata,
     summary: {
@@ -82,7 +91,7 @@ var mcpCatalog = (options, kinds) => Effect_exports.gen(function* () {
     },
     load: (context) => (context === void 0 ? client.list : mcpClientEffect(
       { ...parsed, signal: context.signal },
-      invoke(() => context.cache.invalidate(key))
+      fromPromise(method(context.cache, "invalidate"), "cache")(key)
     ).pipe(Effect_exports.flatMap((source) => source.list))).pipe(
       Effect_exports.flatMap(
         ({ tools, server }) => Schema_exports.encodeEffect(McpServerHeader)(server).pipe(
@@ -99,12 +108,18 @@ var mcpCatalog = (options, kinds) => Effect_exports.gen(function* () {
     ...tool.title === void 0 ? {} : { title: tool.title },
     annotations: { ...tool.annotations, readOnlyHint: kindOf(tool) === "query" }
   });
-  const describe = (tool) => ({
-    ...summarize(tool),
-    inputSchema: tool.inputSchema,
-    ...tool.outputSchema === void 0 ? {} : { outputSchema: tool.outputSchema },
-    ...tool._meta === void 0 ? {} : { _meta: tool._meta }
-  });
+  const operation = (tool) => adaptMcpTool(client, tool).pipe(
+    Effect_exports.map(
+      (adapted) => nativeOperation(
+        protocolOperations({ selected: adapted }, { selected: kindOf(tool) }).selected
+      )
+    )
+  );
+  const describe = (tool) => operation(tool).pipe(
+    Effect_exports.flatMap(
+      (selected) => selected === void 0 ? Effect_exports.succeed(void 0) : operationDescription(tool.name, "", selected)
+    )
+  );
   const router = {
     kind: "dynamic",
     meta: () => catalog.header().pipe(
@@ -113,16 +128,21 @@ var mcpCatalog = (options, kinds) => Effect_exports.gen(function* () {
       ),
       Effect_exports.map(serverMeta)
     ),
-    list: () => catalog.list().pipe(Effect_exports.map((tools) => tools.map(describe))),
+    list: () => catalog.list().pipe(
+      Effect_exports.flatMap((tools) => Effect_exports.forEach(tools, describe)),
+      Effect_exports.map((tools) => tools.filter((tool) => tool !== void 0))
+    ),
     summaries: () => catalog.summaries().pipe(Effect_exports.map((tools) => tools.map(summarize))),
-    describe: (name) => catalog.resolve(name).pipe(Effect_exports.map((tool) => tool === void 0 ? void 0 : describe(tool))),
-    resolve: (name) => Effect_exports.gen(function* () {
-      const tool = yield* catalog.resolve(name);
-      if (tool === void 0) return void 0;
-      const adapted = yield* adaptMcpTool(client, tool);
-      const operations = protocolOperations({ selected: adapted }, { selected: kindOf(tool) });
-      return nativeOperation(operations.selected);
-    })
+    describe: (name) => catalog.resolve(name).pipe(
+      Effect_exports.flatMap(
+        (tool) => tool === void 0 ? Effect_exports.succeed(void 0) : describe(tool)
+      )
+    ),
+    resolve: (name) => catalog.resolve(name).pipe(
+      Effect_exports.flatMap(
+        (tool) => tool === void 0 ? Effect_exports.succeed(void 0) : operation(tool)
+      )
+    )
   };
   return routerDeclaration(router);
 });
@@ -132,7 +152,10 @@ var mcpRouter = (options, kinds = {}) => Effect_exports.runPromise(
   mcpCatalog(options, kinds),
   options.signal === void 0 ? {} : { signal: options.signal }
 );
+var mcpHealth = (check, options) => Effect_exports.runPromise(mcpHealthEffect(check, options), { signal: check.signal });
 export {
+  McpCredentialsUnverified,
   McpError,
+  mcpHealth,
   mcpRouter
 };