apps 0.0.1-beta.5 → 0.0.1-beta.7

package/js/mcp.js

@@ -1,42 +1,42 @@
 import {
   mcpClientEffect
-} from "./chunk-67EVWIGJ.js";
+} from "./chunk-OCYUEU47.js";
 import {
   catalogCache
-} from "./chunk-XHO2ZX6W.js";
+} from "./chunk-RFVIONFX.js";
 import {
   adaptMcpTool
-} from "./chunk-UDDE5KOR.js";
+} from "./chunk-CMYUWAX7.js";
 import {
   protocolOperations
-} from "./chunk-TDNYXSIX.js";
+} from "./chunk-72JNVHPK.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-LUVSFETN.js";
+import "./chunk-UESPOTUI.js";
 import {
   cacheKey
-} from "./chunk-CYYBFC2K.js";
+} from "./chunk-NKLWZJLE.js";
+import "./chunk-FL2QR3XW.js";
 import "./chunk-IPI4MFSN.js";
-import "./chunk-4M277YTM.js";
-import "./chunk-C3VAOK5B.js";
+import "./chunk-YXQHV65J.js";
 import "./chunk-ZQINWV4W.js";
 import {
-  nativeOperation
-} from "./chunk-3XKZDQLM.js";
-import "./chunk-G7T27IWB.js";
+  nativeOperation,
+  routerDeclaration
+} from "./chunk-Z5M2LQOZ.js";
+import "./chunk-MKWZPDR6.js";
 import {
   McpError,
+  McpServerHeader,
   McpToolMetadata,
   McpToolsOptions
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-WLE7WX2U.js";
 import "./chunk-N7YDVXYJ.js";
-import "./chunk-YEPYT6SD.js";
+import "./chunk-R3EV5FTO.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-5T57N25Q.js";
 import "./chunk-PZB6T6KU.js";
 import "./chunk-27F7W2LG.js";
 import {
@@ -50,6 +50,15 @@ 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" }))
@@ -59,27 +68,32 @@ var mcpCatalog = (options, kinds) => Effect_exports.gen(function* () {
     headers[name] = value;
   });
   const id = yield* cacheKey({ url: parsed.url, headers, accountId: parsed.accountId ?? null });
-  const key = ["mcp-catalog-v2", id, "current"];
+  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 catalog = yield* catalogCache({
     ...options,
-    prefix: ["mcp-catalog-v2", id],
+    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 },
@@ -91,34 +105,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
 };

package/js/openapi.js

@@ -2,8 +2,9 @@ import {
   parse
 } from "./chunk-UVL56Z6E.js";
 import {
-  protocolOperations
-} from "./chunk-TDNYXSIX.js";
+  protocolOperations,
+  protocolRouter
+} from "./chunk-72JNVHPK.js";
 import {
   OpenapiError,
   OpenapiErrorResponse,
@@ -16,25 +17,30 @@ import {
   isOpenapiTextMedia,
   openapiBinaryResultSchema,
   openapiMediaKind
-} from "./chunk-4M277YTM.js";
+} from "./chunk-FL2QR3XW.js";
+import "./chunk-IPI4MFSN.js";
 import {
   fromPromise,
   nativeOperation,
+  routerDeclaration,
   toPromise
-} from "./chunk-3XKZDQLM.js";
+} from "./chunk-Z5M2LQOZ.js";
 import {
   accountProviderError,
   httpProviderError
-} from "./chunk-G7T27IWB.js";
+} from "./chunk-MKWZPDR6.js";
 import {
   ApiErrorRecovery,
   ApiErrorResponse,
   OpenapiResponseError,
+  RouterMeta,
   defaultOpenapiErrorLimits
-} from "./chunk-W4DMKWAB.js";
+} from "./chunk-WLE7WX2U.js";
+import "./chunk-N7YDVXYJ.js";
 import {
   ProviderError
-} from "./chunk-SB3V4YVR.js";
+} from "./chunk-R3EV5FTO.js";
+import "./chunk-JU7VHODU.js";
 import {
   FetchHttpClient_exports
 } from "./chunk-57RKNWL2.js";
@@ -47,12 +53,14 @@ import {
   lazyJsonSchemaDecoder,
   once,
   wrap
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
+import "./chunk-PZB6T6KU.js";
 import {
   JsonObject,
   JsonValue
 } from "./chunk-27F7W2LG.js";
 import {
+  Deferred_exports,
   Duration_exports,
   Effect_exports,
   Encoding_exports,
@@ -2392,8 +2400,10 @@ var compileOpenApiDocument = (entry, inputDocument, options = {}) => Effect_expo
         if (!path.startsWith("/") || path.includes("?") || path.includes("#"))
           fail2("operation_path", "An operation has an invalid API path.");
         const operationMethods = [];
-        const operation = Schema_exports.decodeUnknownSync(Operation)(
-          document.resolve(record2(item[method.toLowerCase()]))
+        const resolved2 = document.resolve(record2(item[method.toLowerCase()]));
+        const operation = Schema_exports.decodeUnknownSync(Operation)(resolved2);
+        const tags = Option_exports.getOrUndefined(
+          Schema_exports.decodeUnknownOption(Schema_exports.Array(Schema_exports.NonEmptyString))(resolved2.tags)
         );
         const name = names[index] ?? fail2("operation_path", "An operation has no name.");
         if (built.some((op) => op.operation.name === name))
@@ -2539,6 +2549,7 @@ var compileOpenApiDocument = (entry, inputDocument, options = {}) => Effect_expo
           methods: operationMethods,
           operation: {
             ...streaming ? { streaming: true } : {},
+            ...tags === void 0 || tags.length === 0 ? {} : { tags },
             name,
             ...operation.operationId === void 0 ? {} : { operationId: operation.operationId },
             description: operation.summary ?? operation.description ?? name,
@@ -2648,7 +2659,43 @@ var compileOpenApiDocument = (entry, inputDocument, options = {}) => Effect_expo
 });
 
 // src/implementation/openapi-source.ts
-var Manifest = Schema_exports.Struct({ revision: Schema_exports.String, pages: Schema_exports.Number });
+var Manifest = Schema_exports.Struct({
+  revision: Schema_exports.String,
+  pages: Schema_exports.Number,
+  meta: Schema_exports.optionalKey(RouterMeta)
+});
+var DocumentInfo = Schema_exports.Struct({
+  info: Schema_exports.optionalKey(
+    Schema_exports.Struct({
+      title: Schema_exports.optionalKey(Schema_exports.String),
+      summary: Schema_exports.optionalKey(Schema_exports.String),
+      description: Schema_exports.optionalKey(Schema_exports.String)
+    })
+  ),
+  tags: Schema_exports.optionalKey(
+    Schema_exports.Array(
+      Schema_exports.Struct({
+        name: Schema_exports.NonEmptyString,
+        description: Schema_exports.optionalKey(Schema_exports.String)
+      })
+    )
+  )
+});
+var documentMeta = (document) => {
+  const parsed = Schema_exports.decodeUnknownOption(DocumentInfo)(document);
+  if (Option_exports.isNone(parsed)) return void 0;
+  const { info, tags } = parsed.value;
+  const description = info?.description ?? info?.summary;
+  const labels = (tags ?? []).flatMap(
+    (tag) => tag.description === void 0 ? [] : [[tag.name, tag.description]]
+  );
+  const meta = {
+    ...info?.title === void 0 ? {} : { title: info.title },
+    ...description === void 0 ? {} : { description },
+    ...labels.length === 0 ? {} : { tags: Object.fromEntries(labels) }
+  };
+  return Object.keys(meta).length === 0 ? void 0 : meta;
+};
 var Names = Schema_exports.Array(Schema_exports.String);
 var StoredEntry = Schema_exports.fromJsonString(Schema_exports.Struct({ value: JsonValue }));
 var schema = (decoder) => wrap(decoder, false);
@@ -2763,7 +2810,7 @@ var download = (url, context) => Effect_exports.gen(function* () {
     catch: invalid
   });
 });
-var liveOpenapiOperations = (options) => {
+var liveOpenapiRouter = (options) => {
   const freshFor = options.freshFor ?? "5 minutes";
   const staleFor = options.staleFor ?? "1 day";
   const retention = Duration_exports.toMillis(Duration_exports.fromInputUnsafe(freshFor)) + Duration_exports.toMillis(Duration_exports.fromInputUnsafe(staleFor)) + 3e5;
@@ -2872,17 +2919,31 @@ var liveOpenapiOperations = (options) => {
       }
     );
     retain(revision, retained, retainedBytes);
-    return { revision, pages };
+    const meta = documentMeta(document);
+    return { revision, pages, ...meta === void 0 ? {} : { meta } };
   });
-  const current = Effect_exports.gen(function* () {
-    const key = yield* pointer;
-    return yield* fromPromise(options.cache.get)({
-      key,
-      schema: schema(Manifest),
-      freshFor,
-      staleFor,
-      load: toPromise(refresh)
-    });
+  let reading;
+  const current = Effect_exports.suspend(() => {
+    const shared = reading;
+    if (shared !== void 0) return Deferred_exports.await(shared);
+    const deferred = Deferred_exports.makeUnsafe();
+    reading = deferred;
+    return pointer.pipe(
+      Effect_exports.flatMap(
+        (key) => fromPromise(options.cache.get)({
+          key,
+          schema: schema(Manifest),
+          freshFor,
+          staleFor,
+          load: toPromise(refresh)
+        })
+      ),
+      Effect_exports.onExit(
+        (exit) => Effect_exports.sync(() => {
+          if (reading === deferred) reading = void 0;
+        }).pipe(Effect_exports.andThen(Deferred_exports.done(deferred, exit)))
+      )
+    );
   });
   const read = (revision, kind, names, decoder) => {
     const retained = stored.get(revision);
@@ -2949,7 +3010,7 @@ var liveOpenapiOperations = (options) => {
     const kinds = options.kinds ?? {};
     return Object.hasOwn(kinds, key) ? kinds[key] ?? "mutation" : ["GET", "HEAD", "OPTIONS"].includes(op.method) ? "query" : "mutation";
   };
-  const qualified = (op) => `${kindOf(op) === "query" ? "queries" : "mutations"}.${op.name}`;
+  const readOnly = (op) => kindOf(op) === "query";
   const operationsFor = (manifest) => Effect_exports.gen(function* () {
     const names = yield* namesFor(manifest);
     if (names === void 0) return void 0;
@@ -2970,10 +3031,12 @@ var liveOpenapiOperations = (options) => {
     }
     return all;
   });
-  const summarize = (operation) => {
-    const name = qualified(operation);
-    return { name, description: operation.description, readOnly: name.startsWith("queries.") };
-  };
+  const summarize = (operation) => ({
+    name: operation.name,
+    description: operation.description,
+    readOnly: readOnly(operation),
+    ...operation.tags === void 0 ? {} : { tags: operation.tags }
+  });
   const describe = (operation, bundle) => ({
     ...summarize(operation),
     inputSchema: bundle(parameterDefaultsInput(operation, options.parameterDefaults, true)),
@@ -2987,88 +3050,83 @@ var liveOpenapiOperations = (options) => {
     }
     return yield* invalid();
   });
-  return {
-    queries: {},
-    mutations: {},
-    dynamicTools: {
-      resolve: (name) => withRevision(
-        (manifest) => Effect_exports.gen(function* () {
-          const raw = name.replace(/^(queries|mutations)\./, "");
-          const memoKey = `${manifest.revision}/${defaultedNames}/${raw}`;
-          const memo = resolved.get(memoKey);
-          const operation = memo?.operation ?? (yield* read(manifest.revision, "operation", [raw], OpenapiOperation))[0];
-          if (operation === void 0) {
-            const names = yield* namesFor(manifest);
-            return names === void 0 || names.includes(raw) ? void 0 : { value: void 0 };
-          }
-          if (qualified(operation) !== name) return { value: void 0 };
-          const definitions = memo?.definitions ?? (yield* definitionsFor(manifest.revision, operation));
-          if (definitions === void 0) return void 0;
-          const schemas = memo?.schemas ?? (yield* prepareOpenapiOperation(operation, definitions, options.parameterDefaults));
-          if (memo === void 0) remember(memoKey, { operation, definitions, schemas });
-          const tools = yield* openapiToolsEffect(
-            { ...options, operations: [operation], definitions },
-            /* @__PURE__ */ new Map([[operation.name, schemas]])
-          );
-          const declarations = protocolOperations(tools, {
-            [operation.name]: kindOf(operation)
-          });
-          const declaration = declarations.queries[raw] ?? declarations.mutations[raw];
-          return { value: declaration === void 0 ? void 0 : nativeOperation(declaration) };
-        })
-      ),
-      list: () => withRevision(
-        (manifest) => Effect_exports.gen(function* () {
-          const all = yield* operationsFor(manifest);
-          if (all === void 0) return void 0;
-          const definitions = yield* definitionsFor(manifest.revision, all);
-          if (definitions === void 0) return void 0;
-          const bundle = bundler(definitions);
-          const request = createRequest(options);
-          return {
-            value: all.filter((op) => request.available(op, options.account)).map((operation) => describe(operation, bundle))
-          };
-        })
-      ),
-      summaries: () => withRevision(
-        (manifest) => Effect_exports.gen(function* () {
-          const all = yield* operationsFor(manifest);
-          if (all === void 0) return void 0;
-          const request = createRequest(options);
-          return {
-            value: all.filter((op) => request.available(op, options.account)).map((operation) => summarize(operation))
-          };
-        })
-      ),
-      describe: (name) => withRevision(
-        (manifest) => Effect_exports.gen(function* () {
-          const raw = name.replace(/^(queries|mutations)\./, "");
-          const operation = (yield* read(
-            manifest.revision,
-            "operation",
-            [raw],
-            OpenapiOperation
-          ))[0];
-          if (operation === void 0) {
-            const names = yield* namesFor(manifest);
-            return names === void 0 || names.includes(raw) ? void 0 : { value: void 0 };
-          }
-          if (qualified(operation) !== name || !createRequest(options).available(operation, options.account))
-            return { value: void 0 };
-          const definitions = yield* definitionsFor(manifest.revision, operation);
-          if (definitions === void 0) return void 0;
-          return { value: describe(operation, bundler(definitions)) };
-        })
-      )
-    }
-  };
+  return routerDeclaration({
+    kind: "dynamic",
+    meta: () => current.pipe(Effect_exports.map((manifest) => manifest.meta ?? {})),
+    resolve: (name) => withRevision(
+      (manifest) => Effect_exports.gen(function* () {
+        const raw = name;
+        const memoKey = `${manifest.revision}/${defaultedNames}/${raw}`;
+        const memo = resolved.get(memoKey);
+        const operation = memo?.operation ?? (yield* read(manifest.revision, "operation", [raw], OpenapiOperation))[0];
+        if (operation === void 0) {
+          const names = yield* namesFor(manifest);
+          return names === void 0 || names.includes(raw) ? void 0 : { value: void 0 };
+        }
+        const definitions = memo?.definitions ?? (yield* definitionsFor(manifest.revision, operation));
+        if (definitions === void 0) return void 0;
+        const schemas = memo?.schemas ?? (yield* prepareOpenapiOperation(operation, definitions, options.parameterDefaults));
+        if (memo === void 0) remember(memoKey, { operation, definitions, schemas });
+        const tools = yield* openapiToolsEffect(
+          { ...options, operations: [operation], definitions },
+          /* @__PURE__ */ new Map([[operation.name, schemas]])
+        );
+        const declarations = protocolOperations(tools, {
+          [operation.name]: kindOf(operation)
+        });
+        const declaration = Object.hasOwn(declarations, raw) ? declarations[raw] : void 0;
+        return { value: declaration === void 0 ? void 0 : nativeOperation(declaration) };
+      })
+    ),
+    list: () => withRevision(
+      (manifest) => Effect_exports.gen(function* () {
+        const all = yield* operationsFor(manifest);
+        if (all === void 0) return void 0;
+        const definitions = yield* definitionsFor(manifest.revision, all);
+        if (definitions === void 0) return void 0;
+        const bundle = bundler(definitions);
+        const request = createRequest(options);
+        return {
+          value: all.filter((op) => request.available(op, options.account)).map((operation) => describe(operation, bundle))
+        };
+      })
+    ),
+    summaries: () => withRevision(
+      (manifest) => Effect_exports.gen(function* () {
+        const all = yield* operationsFor(manifest);
+        if (all === void 0) return void 0;
+        const request = createRequest(options);
+        return {
+          value: all.filter((op) => request.available(op, options.account)).map((operation) => summarize(operation))
+        };
+      })
+    ),
+    describe: (name) => withRevision(
+      (manifest) => Effect_exports.gen(function* () {
+        const raw = name;
+        const operation = (yield* read(
+          manifest.revision,
+          "operation",
+          [raw],
+          OpenapiOperation
+        ))[0];
+        if (operation === void 0) {
+          const names = yield* namesFor(manifest);
+          return names === void 0 || names.includes(raw) ? void 0 : { value: void 0 };
+        }
+        if (!createRequest(options).available(operation, options.account))
+          return { value: void 0 };
+        const definitions = yield* definitionsFor(manifest.revision, operation);
+        if (definitions === void 0) return void 0;
+        return { value: describe(operation, bundler(definitions)) };
+      })
+    )
+  });
 };
 
 // src/openapi.ts
-var openapiOperations = (options, kinds = {}) => Effect_exports.runPromise(
-  openapiToolsEffect(options).pipe(
-    Effect_exports.map((operations) => protocolOperations(operations, kinds))
-  ),
+var openapiRouter = (options, kinds = {}) => Effect_exports.runPromise(
+  openapiToolsEffect(options).pipe(Effect_exports.map((operations) => protocolRouter(operations, kinds))),
   options.signal === void 0 ? {} : { signal: options.signal }
 );
 export {
@@ -3079,8 +3137,8 @@ export {
   OpenapiParameter,
   OpenapiRequestBody,
   isOpenapiTextMedia,
-  liveOpenapiOperations,
+  liveOpenapiRouter,
   openapiBinaryResultSchema,
   openapiMediaKind,
-  openapiOperations
+  openapiRouter
 };

package/js/skills.js

@@ -1,15 +1,15 @@
 import {
   catalogCache
-} from "./chunk-XHO2ZX6W.js";
-import "./chunk-CYYBFC2K.js";
+} from "./chunk-RFVIONFX.js";
+import "./chunk-NKLWZJLE.js";
 import {
   folderSkillsEffect,
   skillFromFiles
 } from "./chunk-IPI4MFSN.js";
 import {
   httpProviderError
-} from "./chunk-G7T27IWB.js";
-import "./chunk-YEPYT6SD.js";
+} from "./chunk-MKWZPDR6.js";
+import "./chunk-R3EV5FTO.js";
 import {
   AppSkillMetadata,
   AppSkillSource,
@@ -20,7 +20,6 @@ import {
   SkillServiceName,
   skillLoadLimits
 } from "./chunk-JU7VHODU.js";
-import "./chunk-SB3V4YVR.js";
 import {
   FetchHttpClient_exports
 } from "./chunk-57RKNWL2.js";
@@ -30,7 +29,7 @@ import {
 } from "./chunk-UK573G7W.js";
 import {
   wrap
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import "./chunk-27F7W2LG.js";
 import {
   Effect_exports,
@@ -759,7 +758,7 @@ var cachedCatalog = (options, prefix, load) => options.cache === void 0 ? load(o
   prefix,
   schema: AppSkillSource,
   summary: { schema: AppSkillMetadata, of: ({ files: _files, ...metadata }) => metadata },
-  load: (context) => context === void 0 ? load(options, options.cache) : load({ fetch: options.fetch, signal: context.signal }, context.cache)
+  load: (context) => (context === void 0 ? load(options, options.cache) : load({ fetch: options.fetch, signal: context.signal }, context.cache)).pipe(Effect_exports.map((tools) => ({ tools })))
 }).pipe(
   Effect_exports.flatMap((catalog) => catalog.list()),
   Effect_exports.mapError(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.5",
+  "version": "0.0.1-beta.7",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,