apps 0.0.1-beta.5 → 0.0.1-beta.55

package/js/mcp/stdio.js

@@ -1,39 +1,40 @@
 import {
   adaptMcpTools,
+  answeredError,
   mcpClient,
   mcpJsonSchemaValidator
-} from "../chunk-UDDE5KOR.js";
+} from "../chunk-JK5S2N2S.js";
 import {
-  protocolOperations
-} from "../chunk-TDNYXSIX.js";
+  protocolRouter
+} from "../chunk-L4K2K22P.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-LUVSFETN.js";
-import "../chunk-CYYBFC2K.js";
-import "../chunk-IPI4MFSN.js";
-import "../chunk-4M277YTM.js";
-import "../chunk-C3VAOK5B.js";
-import "../chunk-ZQINWV4W.js";
-import "../chunk-3XKZDQLM.js";
-import "../chunk-G7T27IWB.js";
+import "../chunk-BTSIG4NQ.js";
+import "../chunk-AQU56EPI.js";
+import "../chunk-QEBRH5AP.js";
+import "../chunk-7UUHJR2Q.js";
+import "../chunk-XBG7HHXC.js";
+import "../chunk-PXXZ6ABC.js";
+import "../chunk-47F7VXST.js";
+import "../chunk-LTDHQJ2Z.js";
 import {
   McpError,
   ProcessConfig
-} from "../chunk-DQAZTA4I.js";
-import "../chunk-N7YDVXYJ.js";
-import "../chunk-YEPYT6SD.js";
-import "../chunk-JU7VHODU.js";
-import "../chunk-W4DMKWAB.js";
-import "../chunk-SB3V4YVR.js";
-import "../chunk-RJDDBDSN.js";
-import "../chunk-57RKNWL2.js";
-import "../chunk-UK573G7W.js";
-import "../chunk-FWQC6I3C.js";
-import "../chunk-PZB6T6KU.js";
-import "../chunk-27F7W2LG.js";
+} from "../chunk-TLWLJ7PD.js";
+import "../chunk-MWKHKOTL.js";
+import "../chunk-H72MEDMN.js";
+import "../chunk-KGCTYL2S.js";
+import {
+  owned
+} from "../chunk-JM7LOD2W.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-stdio.ts
@@ -61,10 +62,14 @@ var OwnedTransport = class extends StdioClientTransport {
     })();
   }
 };
-var failure = (phase, error) => new McpError({
-  phase,
-  reason: error instanceof ProtocolError && error.code === ErrorCode.RequestTimeout ? "timeout" : "request"
-});
+var failure = (phase, error) => {
+  const upstream = answeredError(error);
+  return new McpError({
+    phase,
+    reason: error instanceof ProtocolError && error.code === ErrorCode.RequestTimeout ? "timeout" : "request",
+    ...upstream === void 0 ? {} : { upstream }
+  });
+};
 function withClient(config, mode, use) {
   return Effect_exports.scoped(
     Effect_exports.gen(function* () {
@@ -85,22 +90,25 @@ function withClient(config, mode, use) {
             stderr: "ignore"
           })
         })),
-        ({ client: client2, transport: transport2 }) => Effect_exports.tryPromise(async () => {
-          try {
-            await client2.close();
-          } finally {
-            await transport2.close();
-          }
-        }).pipe(Effect_exports.withSpan("provider.mcp.close"), Effect_exports.orDie)
+        ({ client: client2, transport: transport2 }) => (
+          // oxlint-disable-next-line executor/authored-code-through-adapter -- MCP SDK
+          Effect_exports.tryPromise(async () => {
+            try {
+              await client2.close();
+            } finally {
+              await transport2.close();
+            }
+          }).pipe(owned("upstream", "provider.mcp.close"), Effect_exports.orDie)
+        )
       );
       yield* Effect_exports.tryPromise({
         try: (signal) => client.connect(transport, { signal, timeout: config.timeoutMs }),
         catch: (error) => failure("connect", error)
-      }).pipe(Effect_exports.timeout(config.timeoutMs), Effect_exports.withSpan("provider.mcp.connect"));
+      }).pipe(Effect_exports.timeout(config.timeoutMs), owned("upstream", "provider.mcp.connect"));
       return yield* use(client);
     })
   ).pipe(
-    Effect_exports.withSpan("provider.mcp.session", {
+    owned("upstream", "provider.mcp.session", {
       attributes: { "mcp.transport": "stdio", "mcp.operation": mode }
     }),
     (operation) => mode === "discover" ? operation.pipe(Effect_exports.timeout(config.timeoutMs)) : operation,
@@ -120,11 +128,11 @@ var stdioToolsEffect = (input) => Effect_exports.gen(function* () {
 });
 
 // src/mcp-stdio.ts
-var stdioOperations = (config, signal, kinds = {}) => Effect_exports.runPromise(
-  stdioToolsEffect(config).pipe(Effect_exports.map((tools) => protocolOperations(tools, kinds))),
+var stdioRouter = (config, signal, kinds = {}) => Effect_exports.runPromise(
+  stdioToolsEffect(config).pipe(Effect_exports.map((tools) => protocolRouter(tools, kinds))),
   signal === void 0 ? {} : { signal }
 );
 export {
   McpError,
-  stdioOperations
+  stdioRouter
 };

package/js/mcp.js

@@ -1,124 +1,161 @@
 import {
-  mcpClientEffect
-} from "./chunk-67EVWIGJ.js";
+  mcpClientEffect,
+  mcpHealthEffect
+} from "./chunk-XCSG7FT7.js";
 import {
-  catalogCache
-} from "./chunk-XHO2ZX6W.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-UM62MBJQ.js";
 import {
   adaptMcpTool
-} from "./chunk-UDDE5KOR.js";
+} from "./chunk-JK5S2N2S.js";
 import {
   protocolOperations
-} from "./chunk-TDNYXSIX.js";
+} from "./chunk-L4K2K22P.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-LUVSFETN.js";
+import "./chunk-BTSIG4NQ.js";
 import {
   cacheKey
-} from "./chunk-CYYBFC2K.js";
-import "./chunk-IPI4MFSN.js";
-import "./chunk-4M277YTM.js";
-import "./chunk-C3VAOK5B.js";
-import "./chunk-ZQINWV4W.js";
+} from "./chunk-AQU56EPI.js";
 import {
-  nativeOperation
-} from "./chunk-3XKZDQLM.js";
-import "./chunk-G7T27IWB.js";
+  operationDescription
+} from "./chunk-QEBRH5AP.js";
+import "./chunk-7UUHJR2Q.js";
+import "./chunk-XBG7HHXC.js";
+import "./chunk-PXXZ6ABC.js";
 import {
+  nativeOperation,
+  routerDeclaration
+} from "./chunk-47F7VXST.js";
+import {
+  fromPromise,
+  method
+} from "./chunk-LTDHQJ2Z.js";
+import {
+  McpCredentialsUnverified,
   McpError,
+  McpServerHeader,
   McpToolMetadata,
   McpToolsOptions
-} from "./chunk-DQAZTA4I.js";
-import "./chunk-N7YDVXYJ.js";
-import "./chunk-YEPYT6SD.js";
-import "./chunk-JU7VHODU.js";
-import "./chunk-W4DMKWAB.js";
-import "./chunk-SB3V4YVR.js";
-import "./chunk-RJDDBDSN.js";
-import "./chunk-57RKNWL2.js";
-import "./chunk-UK573G7W.js";
-import "./chunk-FWQC6I3C.js";
-import "./chunk-PZB6T6KU.js";
-import "./chunk-27F7W2LG.js";
+} from "./chunk-TLWLJ7PD.js";
+import "./chunk-MWKHKOTL.js";
+import "./chunk-H72MEDMN.js";
+import "./chunk-KGCTYL2S.js";
+import "./chunk-JM7LOD2W.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 {
+    ...title === void 0 ? {} : { title },
+    ...server.description === void 0 ? {} : { description: server.description },
+    ...server.instructions === void 0 ? {} : { instructions: server.instructions },
+    ...server.icons === void 0 ? {} : { icons: server.icons }
+  };
+};
 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 key = ["mcp-catalog-v2", id, "current"];
-  const cache = options.cache;
-  const changed = cache === void 0 ? void 0 : invoke(() => cache.invalidate(key));
-  const client = yield* mcpClientEffect(options, changed);
+  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 changed = cache === void 0 ? void 0 : fromPromise(method(cache, "invalidate"), "cache")(key);
+  const client = yield* mcpClientEffect(parsed, changed);
   const catalog = yield* catalogCache({
     ...options,
-    prefix: ["mcp-catalog-v2", id],
+    cache,
+    prefix: ["mcp-catalog-v3", id],
     schema: McpToolMetadata,
     summary: {
       schema: McpToolSummary,
       of: ({ inputSchema: _input, outputSchema: _output, _meta, ...summary }) => summary
     },
-    load: (context) => context === void 0 ? client.list : mcpClientEffect(
+    load: (context) => (context === void 0 ? client.list : mcpClientEffect(
       { ...parsed, signal: context.signal },
-      invoke(() => context.cache.invalidate(key))
-    ).pipe(Effect_exports.flatMap((source) => source.list))
+      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(
+          Effect_exports.map((header) => ({ tools, header }))
+        )
+      )
+    )
   });
   const kindOf = (tool) => Object.hasOwn(kinds, tool.name) ? kinds[tool.name] ?? "mutation" : tool.annotations?.readOnlyHint === true ? "query" : "mutation";
-  const qualified = (tool) => `${kindOf(tool) === "query" ? "queries" : "mutations"}.${tool.name}`;
   const summarize = (tool) => ({
-    name: qualified(tool),
+    name: tool.name,
     description: tool.description ?? tool.title ?? tool.name,
     readOnly: kindOf(tool) === "query",
     ...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 selected = (name) => Effect_exports.gen(function* () {
-    if (!name.startsWith("queries.") && !name.startsWith("mutations.")) return void 0;
-    const tool = yield* catalog.resolve(name.slice(name.indexOf(".") + 1));
-    return tool === void 0 || qualified(tool) !== name ? void 0 : tool;
-  });
-  const dynamicTools = {
-    list: () => catalog.list().pipe(Effect_exports.map((tools) => tools.map(describe))),
+  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(
+      Effect_exports.flatMap(
+        (header) => header === void 0 ? Effect_exports.succeed({}) : Schema_exports.decodeUnknownEffect(McpServerHeader)(header)
+      ),
+      Effect_exports.map(serverMeta)
+    ),
+    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) => selected(name).pipe(
-      Effect_exports.map((tool) => tool === void 0 ? void 0 : describe(tool))
+    describe: (name) => catalog.resolve(name).pipe(
+      Effect_exports.flatMap(
+        (tool) => tool === void 0 ? Effect_exports.succeed(void 0) : describe(tool)
+      )
     ),
-    resolve: (name) => Effect_exports.gen(function* () {
-      const tool = yield* selected(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.queries.selected ?? operations.mutations.selected);
-    })
+    resolve: (name) => catalog.resolve(name).pipe(
+      Effect_exports.flatMap(
+        (tool) => tool === void 0 ? Effect_exports.succeed(void 0) : operation(tool)
+      )
+    )
   };
-  return { dynamicTools };
+  return routerDeclaration(router);
 });
 
 // src/mcp.ts
-var mcpOperations = (options, kinds = {}) => Effect_exports.runPromise(
+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,
-  mcpOperations
+  mcpHealth,
+  mcpRouter
 };