apps 0.0.1-beta.3 → 0.0.1-beta.31

package/js/graphql.js

@@ -1,55 +1,61 @@
 import {
-  catalogCache
-} from "./chunk-5MQZEB6Y.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-BGALSHLT.js";
 import {
   protocolOperations
-} from "./chunk-Z5NMEGJN.js";
+} from "./chunk-WG5DFZFT.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-J7O55ZV7.js";
+import "./chunk-W7F23NQ2.js";
 import {
   cacheKey
-} from "./chunk-D47C7KG5.js";
-import "./chunk-FDNTX5QJ.js";
-import "./chunk-JN55AYQH.js";
-import "./chunk-PLCMJREA.js";
+} from "./chunk-AYM2FUI5.js";
 import {
-  nativeOperation
-} from "./chunk-PYUYJRSK.js";
+  failOnNetworkRefusal
+} from "./chunk-RULZPNGP.js";
+import "./chunk-OX233L7N.js";
+import "./chunk-FULRJSWU.js";
+import "./chunk-5JVNM3CQ.js";
+import {
+  nativeOperation,
+  routerDeclaration
+} from "./chunk-5XJR4XGW.js";
 import {
   accountProviderError,
   graphqlProviderError,
   httpProviderError
-} from "./chunk-ZJWDMTE3.js";
-import "./chunk-MYYEW3RA.js";
-import "./chunk-BMOIAIVR.js";
-import "./chunk-LGIYBDWA.js";
-import "./chunk-YEJOQEII.js";
-import "./chunk-SWPD52J7.js";
+} from "./chunk-4OKYLVU4.js";
+import {
+  NetworkRefused
+} from "./chunk-N72RKJ5E.js";
+import "./chunk-UMCMZFXW.js";
 import {
   ProviderError
-} from "./chunk-W7D7WVSY.js";
-import "./chunk-ZCAMUXSG.js";
+} from "./chunk-5DLG2FVN.js";
+import "./chunk-HW3DPBZR.js";
+import "./chunk-ETLILMHY.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-HDJH3RPR.js";
-import {
-  HttpClientRequest_exports,
-  HttpClient_exports
-} from "./chunk-QKHR7BMF.js";
+} from "./chunk-MFHUR5SB.js";
 import {
   jsonSchemaDecoder
-} from "./chunk-WFSQXYUT.js";
-import "./chunk-FZJOYIZO.js";
+} from "./chunk-NPGRURDG.js";
+import "./chunk-6KG4DZD7.js";
 import {
   AccountId,
   HttpUrl,
   JsonObject
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-FBBXFFFJ.js";
+import "./chunk-QYM4STZW.js";
+import {
+  HttpClientRequest_exports,
+  HttpClient_exports
+} from "./chunk-CJY5X26R.js";
 import {
   Effect_exports,
   Redacted_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-EXGKN554.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/contracts/graphql.ts
@@ -268,6 +274,7 @@ var graphqlClientEffect = (input) => Effect_exports.gen(function* () {
           HttpClientRequest_exports.bodyJsonUnsafe({ query, variables })
         )
       );
+      yield* failOnNetworkRefusal(response);
       if (response.status < 200 || response.status >= 300)
         return yield* httpProviderError(response.status, response.headers) ?? new GraphqlError({ phase, reason: "request", status: response.status });
       const result = yield* response.json.pipe(
@@ -296,13 +303,13 @@ var graphqlClientEffect = (input) => Effect_exports.gen(function* () {
       orElse: () => Effect_exports.fail(new GraphqlError({ phase, reason: "timeout" }))
     }),
     Effect_exports.mapError(
-      (error) => error instanceof ProviderError && options.accountId !== void 0 ? accountProviderError(error, options.accountId) : error instanceof GraphqlError || error instanceof ProviderError ? error : new GraphqlError({ phase, reason: "request" })
+      (error) => error instanceof ProviderError && options.accountId !== void 0 ? accountProviderError(error, options.accountId) : error instanceof GraphqlError || error instanceof ProviderError || error instanceof NetworkRefused ? error : new GraphqlError({ phase, reason: "request" })
     )
   );
   const discover = request("discover", getIntrospectionQuery()).pipe(
     Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(GraphqlIntrospection)),
     Effect_exports.mapError(
-      (error) => error instanceof GraphqlError || error instanceof ProviderError ? error : new GraphqlError({ phase: "discover", reason: "invalid_response" })
+      (error) => error instanceof GraphqlError || error instanceof ProviderError || error instanceof NetworkRefused ? error : new GraphqlError({ phase: "discover", reason: "invalid_response" })
     )
   );
   return { request, discover };
@@ -429,17 +436,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: {
@@ -448,13 +458,13 @@ var graphqlCatalog = (options, kinds) => Effect_exports.gen(function* () {
     },
     load: (context) => (context === void 0 ? Effect_exports.succeed(client) : graphqlClientEffect({ ...parsed, signal: context.signal })).pipe(
       Effect_exports.flatMap((source) => source.discover),
-      Effect_exports.flatMap(graphqlDefinitions)
+      Effect_exports.flatMap(graphqlDefinitions),
+      Effect_exports.map((tools) => ({ tools }))
     )
   });
   const kindOf = (tool) => Object.hasOwn(kinds, tool.name) ? kinds[tool.name] ?? "mutation" : tool.kind;
-  const qualified = (tool) => `${kindOf(tool) === "query" ? "queries" : "mutations"}.${tool.name}`;
   const summarize = (tool) => ({
-    name: qualified(tool),
+    name: tool.name,
     description: tool.description,
     readOnly: kindOf(tool) === "query"
   });
@@ -462,34 +472,28 @@ var graphqlCatalog = (options, kinds) => Effect_exports.gen(function* () {
     ...summarize(tool),
     inputSchema: tool.inputSchema
   });
-  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",
     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* adaptGraphqlTool(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/graphql.ts
-var graphqlOperations = (options, kinds = {}) => Effect_exports.runPromise(
+var graphqlRouter = (options, kinds = {}) => Effect_exports.runPromise(
   graphqlCatalog(options, kinds),
   options.signal === void 0 ? {} : { signal: options.signal }
 );
 export {
   GraphqlError,
-  graphqlOperations
+  graphqlRouter
 };

package/js/host.js

@@ -1,12 +1,13 @@
 import {
   createAppHandler
-} from "./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";
+} from "./chunk-W7F23NQ2.js";
+import "./chunk-AYM2FUI5.js";
+import "./chunk-RULZPNGP.js";
+import "./chunk-OX233L7N.js";
+import "./chunk-FULRJSWU.js";
+import "./chunk-5JVNM3CQ.js";
+import "./chunk-5XJR4XGW.js";
+import "./chunk-4OKYLVU4.js";
 import {
   ElicitationFailed,
   ElicitationReply,
@@ -20,32 +21,31 @@ import {
   WorkflowRun,
   WorkflowRunId,
   WorkflowRunPage
-} from "./chunk-MYYEW3RA.js";
-import "./chunk-BMOIAIVR.js";
+} from "./chunk-N72RKJ5E.js";
+import "./chunk-UMCMZFXW.js";
 import {
   CacheCommand,
   CacheError,
   CacheReply
-} from "./chunk-LGIYBDWA.js";
-import "./chunk-YEJOQEII.js";
-import "./chunk-SWPD52J7.js";
-import "./chunk-W7D7WVSY.js";
+} from "./chunk-5DLG2FVN.js";
+import "./chunk-HW3DPBZR.js";
 import {
   collectTelemetry,
   withRemoteSpan
-} from "./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-ETLILMHY.js";
+import "./chunk-MFHUR5SB.js";
+import "./chunk-NPGRURDG.js";
+import "./chunk-6KG4DZD7.js";
+import "./chunk-FBBXFFFJ.js";
+import "./chunk-QYM4STZW.js";
+import "./chunk-CJY5X26R.js";
 import {
   Cause_exports,
   Effect_exports,
   Redacted_exports,
   Scheduler_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-EXGKN554.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/implementation/cache-session.ts