apps 0.0.1-beta.2 → 0.0.1-beta.21

package/js/mcp/stdio.js

@@ -2,37 +2,36 @@ import {
   adaptMcpTools,
   mcpClient,
   mcpJsonSchemaValidator
-} from "../chunk-RN2MXB4R.js";
+} from "../chunk-BLI53LPN.js";
 import {
-  protocolOperations
-} from "../chunk-Z5NMEGJN.js";
+  protocolRouter
+} from "../chunk-RAAPJMVZ.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-J7O55ZV7.js";
-import "../chunk-D47C7KG5.js";
-import "../chunk-FDNTX5QJ.js";
-import "../chunk-JN55AYQH.js";
-import "../chunk-PLCMJREA.js";
-import "../chunk-PYUYJRSK.js";
-import "../chunk-ZJWDMTE3.js";
+import "../chunk-CHAK4P5C.js";
+import "../chunk-NKLWZJLE.js";
+import "../chunk-625MBYU4.js";
+import "../chunk-IPI4MFSN.js";
+import "../chunk-XNCYIB4D.js";
+import "../chunk-ZQINWV4W.js";
+import "../chunk-NMKHTJOQ.js";
+import "../chunk-MKWZPDR6.js";
 import {
   McpError,
   ProcessConfig
-} from "../chunk-MYYEW3RA.js";
-import "../chunk-BMOIAIVR.js";
-import "../chunk-LGIYBDWA.js";
-import "../chunk-YEJOQEII.js";
-import "../chunk-SWPD52J7.js";
-import "../chunk-W7D7WVSY.js";
-import "../chunk-ZCAMUXSG.js";
-import "../chunk-HDJH3RPR.js";
-import "../chunk-QKHR7BMF.js";
-import "../chunk-WFSQXYUT.js";
-import "../chunk-FZJOYIZO.js";
-import "../chunk-SATWJKN6.js";
+} from "../chunk-VXWY44LE.js";
+import "../chunk-N7YDVXYJ.js";
+import "../chunk-R3EV5FTO.js";
+import "../chunk-JU7VHODU.js";
+import "../chunk-ODEIDRGW.js";
+import "../chunk-57RKNWL2.js";
+import "../chunk-UK573G7W.js";
+import "../chunk-4QQ62BVS.js";
+import "../chunk-PZB6T6KU.js";
+import "../chunk-27F7W2LG.js";
 import {
   Effect_exports,
   Schema_exports
-} from "../chunk-FW5HBOIK.js";
+} from "../chunk-CDL5PM2Q.js";
 import "../chunk-CZ7CSFO4.js";
 
 // src/implementation/mcp-stdio.ts
@@ -119,11 +118,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,47 +1,49 @@
 import {
   mcpClientEffect
-} from "./chunk-HDTGZWP2.js";
+} from "./chunk-CMRKLZZY.js";
 import {
-  catalogCache
-} from "./chunk-5MQZEB6Y.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-OZ4UK3CD.js";
 import {
   adaptMcpTool
-} from "./chunk-RN2MXB4R.js";
+} from "./chunk-BLI53LPN.js";
 import {
   protocolOperations
-} from "./chunk-Z5NMEGJN.js";
+} from "./chunk-RAAPJMVZ.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-J7O55ZV7.js";
+import "./chunk-CHAK4P5C.js";
 import {
   cacheKey
-} from "./chunk-D47C7KG5.js";
-import "./chunk-FDNTX5QJ.js";
-import "./chunk-JN55AYQH.js";
-import "./chunk-PLCMJREA.js";
+} from "./chunk-NKLWZJLE.js";
+import "./chunk-625MBYU4.js";
+import "./chunk-IPI4MFSN.js";
+import "./chunk-XNCYIB4D.js";
+import "./chunk-ZQINWV4W.js";
 import {
-  nativeOperation
-} from "./chunk-PYUYJRSK.js";
-import "./chunk-ZJWDMTE3.js";
+  nativeOperation,
+  routerDeclaration
+} from "./chunk-NMKHTJOQ.js";
+import "./chunk-MKWZPDR6.js";
 import {
   McpError,
+  McpServerHeader,
   McpToolMetadata,
   McpToolsOptions
-} from "./chunk-MYYEW3RA.js";
-import "./chunk-BMOIAIVR.js";
-import "./chunk-LGIYBDWA.js";
-import "./chunk-YEJOQEII.js";
-import "./chunk-SWPD52J7.js";
-import "./chunk-W7D7WVSY.js";
-import "./chunk-ZCAMUXSG.js";
-import "./chunk-HDJH3RPR.js";
-import "./chunk-QKHR7BMF.js";
-import "./chunk-WFSQXYUT.js";
-import "./chunk-FZJOYIZO.js";
-import "./chunk-SATWJKN6.js";
+} from "./chunk-VXWY44LE.js";
+import "./chunk-N7YDVXYJ.js";
+import "./chunk-R3EV5FTO.js";
+import "./chunk-JU7VHODU.js";
+import "./chunk-ODEIDRGW.js";
+import "./chunk-57RKNWL2.js";
+import "./chunk-UK573G7W.js";
+import "./chunk-4QQ62BVS.js";
+import "./chunk-PZB6T6KU.js";
+import "./chunk-27F7W2LG.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/implementation/mcp-catalog.ts
@@ -49,36 +51,52 @@ 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 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, invalid);
+  const id = yield* cacheKey({ url: parsed.url });
+  const key = ["mcp-catalog-v3", id, "current"];
   const changed = cache === void 0 ? void 0 : invoke(() => cache.invalidate(key));
-  const client = yield* mcpClientEffect(options, changed);
+  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))
+    ).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 },
@@ -90,34 +108,34 @@ var mcpCatalog = (options, kinds) => Effect_exports.gen(function* () {
     ...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 = {
+  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.map((tools) => tools.map(describe))),
     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.map((tool) => tool === void 0 ? void 0 : describe(tool))),
     resolve: (name) => Effect_exports.gen(function* () {
-      const tool = yield* selected(name);
+      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.queries.selected ?? operations.mutations.selected);
+      return nativeOperation(operations.selected);
     })
   };
-  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 }
 );
 export {
   McpError,
-  mcpOperations
+  mcpRouter
 };