apps 0.0.1-beta.6 → 0.0.1-beta.60

package/js/index.js

@@ -1,13 +1,12 @@
 import {
+  ResponseDecodeError,
+  ResponseStatusError,
   defineApp,
-  defineDatabase,
-  table,
+  event,
   workflow
-} from "./chunk-OE3QQTSB.js";
-import "./chunk-ZQINWV4W.js";
+} from "./chunk-ERJ5JGCB.js";
 import {
   dynamicRouter,
-  fromPromise,
   mutation,
   nativeOperation,
   nativeRouter,
@@ -15,11 +14,14 @@ import {
   query,
   router,
   routerDeclaration,
-  withApproval
-} from "./chunk-T7GKZBLP.js";
+  toolAnnotations,
+  withApproval,
+  withApprovals
+} from "./chunk-JIU25DIL.js";
 import {
-  accountProviderError
-} from "./chunk-MKWZPDR6.js";
+  accountProviderError,
+  fromPromise
+} from "./chunk-T53665H5.js";
 import {
   CalendarSchedule,
   ElicitationFailed,
@@ -34,19 +36,21 @@ import {
   ScheduleTiming,
   SecretsMethod,
   WorkflowFailure
-} from "./chunk-B3EOZTK3.js";
-import "./chunk-N7YDVXYJ.js";
+} from "./chunk-TLWLJ7PD.js";
 import {
   CacheError,
+  FetchOptionUnsupported,
+  NetworkRefused,
   ProviderError
-} from "./chunk-R3EV5FTO.js";
-import "./chunk-JU7VHODU.js";
+} from "./chunk-MWKHKOTL.js";
+import "./chunk-H72MEDMN.js";
 import {
   array,
   boolean,
   decoderOf,
-  id,
+  fieldExposure,
   importedJsonSchema,
+  isSchema,
   json,
   jsonSchema,
   literal,
@@ -55,42 +59,29 @@ import {
   object,
   once,
   parse,
+  plain,
+  raw,
   record,
   string,
-  userId,
   withLazyJsonSchemaDocument,
   wrap
-} from "./chunk-5T57N25Q.js";
-import "./chunk-PZB6T6KU.js";
+} from "./chunk-KGCTYL2S.js";
+import "./chunk-FFSO3J76.js";
+import "./chunk-PD6I2SDG.js";
+import "./chunk-5FHWNLCI.js";
 import {
   JsonObject,
   JsonValue,
   ValidationError
-} from "./chunk-27F7W2LG.js";
+} from "./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/contracts/http.ts
-var ResponseStatusError = class extends Schema_exports.TaggedError()(
-  "ResponseStatusError",
-  { status: Schema_exports.Number }
-) {
-  get message() {
-    return `Request failed with status ${this.status}`;
-  }
-};
-var ResponseDecodeError = class extends Schema_exports.TaggedError()(
-  "ResponseDecodeError",
-  {}
-) {
-  get message() {
-    return "Response body did not match the expected schema";
-  }
-};
-
 // src/implementation/http.ts
 var decodeJson = (response, schema) => Effect_exports.gen(function* () {
   if (response.status < 200 || response.status >= 300) {
@@ -102,20 +93,33 @@ var decodeJson = (response, schema) => Effect_exports.gen(function* () {
 
 // src/implementation/provider.ts
 var secrets = (options) => new SecretsMethod(options);
-var oauth2 = (config, response) => parse(OAuth2Config, config).pipe(Effect_exports.map((config2) => new OAuth2Method({ config: config2, response })));
-var defineProvider = (options) => new Provider(options);
+var oauth2 = (config, response, exposure) => parse(OAuth2Config, config).pipe(
+  Effect_exports.map(
+    (config2) => new OAuth2Method({ config: config2, response, ...exposure === void 0 ? {} : { exposure } })
+  )
+);
+var defineProvider = ({
+  health,
+  ...options
+}) => {
+  if (health === void 0) return new Provider(options);
+  const run = fromPromise(health, "check");
+  return new Provider({ ...options, health: { run } });
+};
 
 // src/implementation/account-router.ts
-var inputDocument = (operation) => {
-  const imported = importedJsonSchema(operation.input);
+var decoderDocument = (decoder) => {
+  const imported = importedJsonSchema(decoder);
   if (imported !== void 0) return Schema_exports.decodeUnknownSync(JsonObject)(imported);
-  const document = Schema_exports.toJsonSchemaDocument(operation.input);
+  const document = Schema_exports.toJsonSchemaDocument(decoder);
   return Schema_exports.decodeUnknownSync(JsonObject)({ ...document.schema, $defs: document.definitions });
 };
 var declaresOutput = (operation) => {
+  if (operation.output !== void 0) return true;
   const property = Object.getOwnPropertyDescriptor(operation, "outputSchema");
   return property !== void 0 && (property.get !== void 0 || property.value !== void 0);
 };
+var outputDocument = (operation) => operation.output === void 0 ? operation.outputSchema : decoderDocument(operation.output);
 var combineOperation = (accounts) => {
   const variants = [...accounts.values()];
   const first = variants[0];
@@ -138,7 +142,10 @@ var combineOperation = (accounts) => {
       type: "object",
       properties: {
         accountId: { type: "string", const: accountId },
-        input: nestJsonSchema(inputDocument(operation), `#/anyOf/${index}/properties/input`)
+        input: nestJsonSchema(
+          decoderDocument(operation.input),
+          `#/anyOf/${index}/properties/input`
+        )
       },
       required: ["accountId", "input"]
     }))
@@ -168,9 +175,10 @@ var combineOperation = (accounts) => {
   });
   if (variants.every(declaresOutput)) {
     const outputSchema = once(() => ({
-      anyOf: variants.flatMap(
-        (operation) => operation.outputSchema === void 0 ? [] : [operation.outputSchema]
-      ).map((output, index) => nestJsonSchema(output, `#/anyOf/${index}`))
+      anyOf: variants.flatMap((operation) => {
+        const output = outputDocument(operation);
+        return output === void 0 ? [] : [output];
+      }).map((output, index) => nestJsonSchema(output, `#/anyOf/${index}`))
     }));
     const native2 = nativeOperation(declaration2);
     if (native2 !== void 0)
@@ -227,7 +235,7 @@ var combineDynamic = (sources) => {
       );
       for (const tool of tools) {
         const variants = groups.get(tool.name) ?? [];
-        if (variants.some(([id2]) => id2 === accountId))
+        if (variants.some(([id]) => id === accountId))
           return yield* Effect_exports.die(new Error("Duplicate source operation"));
         variants.push([accountId, tool]);
         groups.set(tool.name, variants);
@@ -316,7 +324,7 @@ var accountRouter = (accounts, discover, options) => Effect_exports.runPromise(
     const routers = /* @__PURE__ */ new Map();
     for (const account of accounts) {
       const declaration2 = yield* Effect_exports.tryPromise({
-        try: () => discover(account),
+        try: async () => discover(account),
         catch: (error) => accountProviderError(error, account.id)
       });
       if (routers.has(account.id))
@@ -336,7 +344,7 @@ var accountRouter = (accounts, discover, options) => Effect_exports.runPromise(
 
 // src/implementation/dynamic-skills.ts
 var dynamicSkills = (source) => ({
-  list: fromPromise(async () => source.list())
+  list: fromPromise(async () => source.list(), "skills")
 });
 
 // src/contracts/app.ts
@@ -375,21 +383,39 @@ var cron = (calendar, operation, input) => declaration(
 );
 
 // src/index.ts
+var isFields = (value) => typeof value === "object" && value !== null && Object.values(value).every(isSchema);
+var accountDecoder = (schema) => (
+  // SAFETY: the brand exists only in types; secret values are strings at runtime.
+  decoderOf(schema)
+);
+var exposureOf = (schema) => {
+  const marked = "fields" in schema && isFields(schema.fields) ? fieldExposure(schema.fields) : {};
+  return Object.keys(marked).length === 0 ? {} : { exposure: marked };
+};
 var OAuth2AccessToken2 = wrap(OAuth2AccessToken, false);
-var secrets2 = (options) => secrets({ label: options.label, fields: decoderOf(options.fields) });
+var secrets2 = (options) => secrets({
+  label: options.label,
+  fields: accountDecoder(options.fields),
+  ...exposureOf(options.fields)
+});
 function oauth22(options) {
   const { response = OAuth2AccessToken2, ...config } = options;
-  return Effect_exports.runSync(oauth2(config, decoderOf(response)));
+  return Effect_exports.runSync(
+    oauth2(config, accountDecoder(response), exposureOf(response).exposure)
+  );
 }
 var decodeJson2 = (response, schema) => {
   const native = {
     status: response.status,
-    json: () => Effect_exports.tryPromise({
-      try: () => response.json(),
-      catch: (error) => error
-    }).pipe(
-      Effect_exports.catch(
-        (error) => error instanceof SyntaxError ? Effect_exports.fail(new ResponseDecodeError()) : Effect_exports.die(error)
+    json: () => (
+      // oxlint-disable-next-line executor/authored-code-through-adapter -- a Response the app passes from its own code
+      Effect_exports.tryPromise({
+        try: () => response.json(),
+        catch: (error) => error
+      }).pipe(
+        Effect_exports.catch(
+          (error) => error instanceof SyntaxError ? Effect_exports.fail(new ResponseDecodeError()) : Effect_exports.die(error)
+        )
       )
     )
   };
@@ -398,6 +424,8 @@ var decodeJson2 = (response, schema) => {
 export {
   CacheError,
   ElicitationFailed,
+  FetchOptionUnsupported,
+  NetworkRefused,
   NonRetryableError,
   NotImplemented,
   OAuth2AccessToken2 as OAuth2AccessToken,
@@ -412,11 +440,10 @@ export {
   cron,
   decodeJson2 as decodeJson,
   defineApp,
-  defineDatabase,
   defineProvider,
   dynamicRouter,
   dynamicSkills,
-  id,
+  event,
   interval,
   json,
   jsonSchema,
@@ -425,13 +452,15 @@ export {
   number,
   oauth22 as oauth2,
   object,
+  plain,
   query,
+  raw,
   record,
   router,
   secrets2 as secrets,
   string,
-  table,
-  userId,
+  toolAnnotations,
   withApproval,
+  withApprovals,
   workflow
 };

package/js/mcp/effect.js

@@ -1,30 +1,32 @@
 import {
   mcpClientEffect,
+  mcpHealthEffect,
   mcpToolsEffect
-} from "../chunk-6BSSI67S.js";
-import "../chunk-ITM77QPO.js";
+} from "../chunk-MRV45IXB.js";
+import "../chunk-CWW7QWP4.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-SB4HEPNJ.js";
-import "../chunk-NKLWZJLE.js";
-import "../chunk-MNMNLXBL.js";
-import "../chunk-IPI4MFSN.js";
-import "../chunk-OE3QQTSB.js";
-import "../chunk-ZQINWV4W.js";
-import "../chunk-T7GKZBLP.js";
-import "../chunk-MKWZPDR6.js";
-import "../chunk-B3EOZTK3.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";
-import "../chunk-CDL5PM2Q.js";
+import "../chunk-MZNCLCGJ.js";
+import "../chunk-AQU56EPI.js";
+import "../chunk-ZYTA5MK4.js";
+import "../chunk-NS3DEHVA.js";
+import "../chunk-XBG7HHXC.js";
+import "../chunk-ERJ5JGCB.js";
+import "../chunk-JIU25DIL.js";
+import "../chunk-T53665H5.js";
+import "../chunk-TLWLJ7PD.js";
+import "../chunk-MWKHKOTL.js";
+import "../chunk-H72MEDMN.js";
+import "../chunk-KGCTYL2S.js";
+import "../chunk-FFSO3J76.js";
+import "../chunk-PD6I2SDG.js";
+import "../chunk-5FHWNLCI.js";
+import "../chunk-H2CJWXA3.js";
+import "../chunk-TUMGL2OC.js";
+import "../chunk-EOPQ727L.js";
+import "../chunk-IFJU5SYQ.js";
 import "../chunk-CZ7CSFO4.js";
 export {
   mcpClientEffect,
+  mcpHealthEffect,
   mcpToolsEffect
 };

package/js/mcp/stdio.js

@@ -1,37 +1,40 @@
 import {
   adaptMcpTools,
+  answeredError,
   mcpClient,
   mcpJsonSchemaValidator
-} from "../chunk-ITM77QPO.js";
+} from "../chunk-CWW7QWP4.js";
 import {
   protocolRouter
-} from "../chunk-ECQFRCH4.js";
+} from "../chunk-2ARGIHVD.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-SB4HEPNJ.js";
-import "../chunk-NKLWZJLE.js";
-import "../chunk-MNMNLXBL.js";
-import "../chunk-IPI4MFSN.js";
-import "../chunk-OE3QQTSB.js";
-import "../chunk-ZQINWV4W.js";
-import "../chunk-T7GKZBLP.js";
-import "../chunk-MKWZPDR6.js";
+import "../chunk-MZNCLCGJ.js";
+import "../chunk-AQU56EPI.js";
+import "../chunk-ZYTA5MK4.js";
+import "../chunk-NS3DEHVA.js";
+import "../chunk-XBG7HHXC.js";
+import "../chunk-ERJ5JGCB.js";
+import "../chunk-JIU25DIL.js";
+import "../chunk-T53665H5.js";
 import {
   McpError,
   ProcessConfig
-} from "../chunk-B3EOZTK3.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-TLWLJ7PD.js";
+import "../chunk-MWKHKOTL.js";
+import "../chunk-H72MEDMN.js";
+import "../chunk-KGCTYL2S.js";
+import {
+  owned
+} from "../chunk-FFSO3J76.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
@@ -59,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* () {
@@ -83,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,

package/js/mcp.js

@@ -1,55 +1,62 @@
 import {
-  mcpClientEffect
-} from "./chunk-6BSSI67S.js";
+  mcpClientEffect,
+  mcpHealthEffect
+} from "./chunk-MRV45IXB.js";
 import {
-  catalogCache
-} from "./chunk-RFVIONFX.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-IJ6Y2KFQ.js";
 import {
   adaptMcpTool
-} from "./chunk-ITM77QPO.js";
+} from "./chunk-CWW7QWP4.js";
 import {
   protocolOperations
-} from "./chunk-ECQFRCH4.js";
+} from "./chunk-2ARGIHVD.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-SB4HEPNJ.js";
+import "./chunk-MZNCLCGJ.js";
 import {
   cacheKey
-} from "./chunk-NKLWZJLE.js";
-import "./chunk-MNMNLXBL.js";
-import "./chunk-IPI4MFSN.js";
-import "./chunk-OE3QQTSB.js";
-import "./chunk-ZQINWV4W.js";
+} from "./chunk-AQU56EPI.js";
+import {
+  operationDescription
+} from "./chunk-ZYTA5MK4.js";
+import "./chunk-NS3DEHVA.js";
+import "./chunk-XBG7HHXC.js";
+import "./chunk-ERJ5JGCB.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-T7GKZBLP.js";
-import "./chunk-MKWZPDR6.js";
+} from "./chunk-JIU25DIL.js";
+import {
+  fromPromise,
+  method
+} from "./chunk-T53665H5.js";
 import {
+  McpCredentialsUnverified,
   McpError,
   McpServerHeader,
   McpToolMetadata,
   McpToolsOptions
-} from "./chunk-B3EOZTK3.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-TLWLJ7PD.js";
+import "./chunk-MWKHKOTL.js";
+import "./chunk-H72MEDMN.js";
+import "./chunk-KGCTYL2S.js";
+import "./chunk-FFSO3J76.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
 };