apps 0.0.1-beta.19 → 0.0.1-beta.20

package/js/{chunk-4EMWIFFJ.js → chunk-OZ4UK3CD.js}

@@ -14,6 +14,13 @@ import {
 } from "./chunk-CDL5PM2Q.js";
 
 // src/implementation/catalog-cache.ts
+var catalogScope = (options, invalid) => {
+  const { account, cache, headers } = options;
+  if (account === void 0)
+    return headers === void 0 ? Effect_exports.succeed(cache) : Effect_exports.fail(invalid());
+  if (cache === void 0) return Effect_exports.succeed(void 0);
+  return Effect_exports.try({ try: () => cache.forAccount(account), catch: invalid });
+};
 var schema = (decoder) => wrap(decoder, false);
 var Manifest = Schema_exports.Struct({
   revision: Schema_exports.String,
@@ -185,5 +192,6 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
 });
 
 export {
+  catalogScope,
   catalogCache
 };

package/js/graphql.js

@@ -1,6 +1,7 @@
 import {
-  catalogCache
-} from "./chunk-4EMWIFFJ.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-OZ4UK3CD.js";
 import {
   protocolOperations
 } from "./chunk-HQY4UTYX.js";
@@ -429,17 +430,20 @@ var GraphqlToolSummary = GraphqlToolDefinition.mapFields(({ name, kind, descript
   description
 }));
 var graphqlCatalog = (options, kinds) => Effect_exports.gen(function* () {
-  const parsed = yield* Schema_exports.decodeUnknownEffect(GraphqlToolsOptions)(options).pipe(
-    Effect_exports.mapError(() => new GraphqlError({ phase: "discover", 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 GraphqlError({ phase: "discover", reason: "invalid_input" });
+  const parsed = yield* Schema_exports.decodeUnknownEffect(GraphqlToolsOptions)({
+    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 client = yield* graphqlClientEffect(parsed);
   const catalog = yield* catalogCache({
     ...options,
+    cache,
     prefix: ["graphql-catalog-v2", id],
     schema: GraphqlToolDefinition,
     summary: {

package/js/mcp.js

@@ -2,8 +2,9 @@ import {
   mcpClientEffect
 } from "./chunk-MAF4BRQF.js";
 import {
-  catalogCache
-} from "./chunk-4EMWIFFJ.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-OZ4UK3CD.js";
 import {
   adaptMcpTool
 } from "./chunk-7H44SOSX.js";
@@ -60,20 +61,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, 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 client = yield* mcpClientEffect(parsed, changed);
   const catalog = yield* catalogCache({
     ...options,
+    cache,
     prefix: ["mcp-catalog-v3", id],
     schema: McpToolMetadata,
     summary: {

package/js/skills.js

@@ -1,6 +1,6 @@
 import {
   catalogCache
-} from "./chunk-4EMWIFFJ.js";
+} from "./chunk-OZ4UK3CD.js";
 import "./chunk-NKLWZJLE.js";
 import {
   folderSkillsEffect,

package/package.json

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