apps 0.0.1-beta.28 → 0.0.1-beta.30

package/js/openapi.js

@@ -8,12 +8,13 @@ import {
 import {
   protocolOperations,
   protocolRouter
-} from "./chunk-MWCLJQRI.js";
+} from "./chunk-3SPRHIEE.js";
 import {
   OpenapiCompileError,
   OpenapiCompileErrorCode,
   OpenapiError,
   OpenapiErrorResponse,
+  OpenapiMediaType,
   OpenapiOperation,
   OpenapiParameter,
   OpenapiRequestBody,
@@ -27,14 +28,14 @@ import {
   isOpenapiTextMedia,
   openapiBinaryResultSchema,
   openapiMediaKind
-} from "./chunk-JN3PEGMW.js";
-import "./chunk-TSLG2WPA.js";
+} from "./chunk-PUC24GZP.js";
+import "./chunk-4N26L465.js";
 import {
   fromPromise,
   nativeOperation,
   routerDeclaration,
   toPromise
-} from "./chunk-GQ7GCZ4J.js";
+} from "./chunk-6VWYEQ4X.js";
 import {
   accountProviderError,
   httpProviderError
@@ -46,21 +47,17 @@ import {
   OpenapiResponseError,
   RouterMeta,
   defaultOpenapiErrorLimits
-} from "./chunk-TE2HPDZG.js";
+} from "./chunk-BSRU52RU.js";
 import "./chunk-M2KEEOIQ.js";
 import {
   ProviderError,
   cacheLimits
 } from "./chunk-BRGF7VFN.js";
-import "./chunk-NSBRV4FJ.js";
-import "./chunk-YXKXKGN6.js";
+import "./chunk-MYCVMDWI.js";
+import "./chunk-WGBI5MVX.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-V2I3MMPM.js";
-import {
-  HttpClientRequest_exports,
-  HttpClient_exports
-} from "./chunk-B5YJQU45.js";
+} from "./chunk-BBTELEAN.js";
 import {
   jsonSchema,
   lazyJsonSchemaDecoder,
@@ -71,6 +68,11 @@ import "./chunk-BTJMXW4I.js";
 import {
   JsonObject
 } from "./chunk-PWF2DRJ3.js";
+import "./chunk-2D2PKLGQ.js";
+import {
+  HttpClientRequest_exports,
+  HttpClient_exports
+} from "./chunk-XGN5IFOZ.js";
 import {
   Deferred_exports,
   Duration_exports,
@@ -90,6 +92,19 @@ import "./chunk-CZ7CSFO4.js";
 var loadSwaggerClient = () => import("./es-DIULA3ZF.js").then((module) => module.default);
 
 // src/implementation/openapi-request.ts
+var mediaType = Schema_exports.decodeUnknownOption(OpenapiMediaType);
+var responseShape = (response) => {
+  const contentType = mediaType(
+    response.headers["content-type"]?.split(";")[0]?.trim().toLowerCase()
+  );
+  const length = response.headers["content-length"];
+  const bytes2 = length === void 0 || !/^\d{1,15}$/.test(length) ? void 0 : Number(length);
+  return {
+    status: response.status,
+    ...Option_exports.isSome(contentType) ? { contentType: contentType.value } : {},
+    ...bytes2 === void 0 ? {} : { bytes: bytes2 }
+  };
+};
 var bodyRecovery = Schema_exports.decodeUnknownOption(Schema_exports.Struct({ recovery: ApiErrorRecovery }));
 function responseError(response, errors) {
   return Effect_exports.gen(function* () {
@@ -240,147 +255,160 @@ function createRequest(config) {
     const keys = security.length === 0 ? [] : security.map(Object.keys).find((keys2) => keys2.every((key) => Object.hasOwn(authorized, key)));
     return keys === void 0 ? void 0 : Object.fromEntries(keys.map((key) => [key, authorized[key]]));
   }
-  const call = (op, input, account, errors) => Effect_exports.scoped(
-    Effect_exports.gen(function* () {
-      const swagger = yield* Effect_exports.promise(loadSwaggerClient);
-      const prepared = yield* Effect_exports.try({
-        try: () => {
-          const args = object(input);
-          const authorized = selectedCredentials(op, account);
-          if (authorized === void 0)
-            throw new Error("The selected account cannot call this tool");
-          const parameters = {};
-          let path = op.path;
-          const querystrings = [];
-          const swaggerParameters = op.request.parameters.filter((p) => {
-            const group = args[p.in === "header" ? "headers" : p.in];
-            const value = group === void 0 ? void 0 : object(group)[p.name];
-            if (p.in === "path" && p.allowReserved === true && p.content === void 0) {
-              if (value === void 0) throw new Error("A required path parameter is missing");
-              path = path.replaceAll(`{${p.name}}`, reservedPathValue(value));
-              return false;
-            }
-            if (p.in === "querystring") {
-              if (value !== void 0) querystrings.push(querystringValue(p, value));
-              else if (p.required === true)
-                throw new Error("A required querystring parameter is missing");
-              return false;
-            }
-            if (group !== void 0) parameters[`${p.in}.${p.name}`] = value;
-            return true;
-          });
-          const content = op.request.requestBody?.content ?? {};
-          const contentType2 = args.contentType === void 0 ? Object.keys(content)[0] : scalar(args.contentType);
-          const media = contentType2 === void 0 ? void 0 : content[contentType2];
-          let body = args.body;
-          if (body !== void 0 && media !== void 0 && contentType2 !== void 0) {
-            const kind = openapiMediaKind(contentType2);
-            if (kind === "json") body = JSON.stringify(body);
-            else if (kind === "binary") body = new Blob([bytes(body)]);
-            else if (kind === "multipart") {
-              const fields = { ...object(body) };
-              for (const [name, property] of Object.entries(
-                object(media.schema?.properties ?? {})
-              )) {
-                if (isOpenapiFileSchema(object(property)) && fields[name] !== void 0)
-                  fields[name] = new File([bytes(fields[name])], name);
+  const call = (op, input, account, errors) => {
+    const operation = { method: op.method, path: op.path };
+    return Effect_exports.scoped(
+      Effect_exports.gen(function* () {
+        const swagger = yield* Effect_exports.promise(loadSwaggerClient);
+        const prepared = yield* Effect_exports.try({
+          try: () => {
+            const args = object(input);
+            const authorized = selectedCredentials(op, account);
+            if (authorized === void 0)
+              throw new Error("The selected account cannot call this tool");
+            const parameters = {};
+            let path = op.path;
+            const querystrings = [];
+            const swaggerParameters = op.request.parameters.filter((p) => {
+              const group = args[p.in === "header" ? "headers" : p.in];
+              const value = group === void 0 ? void 0 : object(group)[p.name];
+              if (p.in === "path" && p.allowReserved === true && p.content === void 0) {
+                if (value === void 0) throw new Error("A required path parameter is missing");
+                path = path.replaceAll(`{${p.name}}`, reservedPathValue(value));
+                return false;
+              }
+              if (p.in === "querystring") {
+                if (value !== void 0) querystrings.push(querystringValue(p, value));
+                else if (p.required === true)
+                  throw new Error("A required querystring parameter is missing");
+                return false;
+              }
+              if (group !== void 0) parameters[`${p.in}.${p.name}`] = value;
+              return true;
+            });
+            const content = op.request.requestBody?.content ?? {};
+            const contentType2 = args.contentType === void 0 ? Object.keys(content)[0] : scalar(args.contentType);
+            const media = contentType2 === void 0 ? void 0 : content[contentType2];
+            let body = args.body;
+            if (body !== void 0 && media !== void 0 && contentType2 !== void 0) {
+              const kind = openapiMediaKind(contentType2);
+              if (kind === "json") body = JSON.stringify(body);
+              else if (kind === "binary") body = new Blob([bytes(body)]);
+              else if (kind === "multipart") {
+                const fields = { ...object(body) };
+                for (const [name, property] of Object.entries(
+                  object(media.schema?.properties ?? {})
+                )) {
+                  if (isOpenapiFileSchema(object(property)) && fields[name] !== void 0)
+                    fields[name] = new File([bytes(fields[name])], name);
+                }
+                body = fields;
               }
-              body = fields;
             }
-          }
-          const prepared2 = swaggerRequest(
-            swagger.buildRequest({
-              spec: {
-                openapi: op.openapi,
-                servers: [{ url: op.baseUrl }],
-                components: { securitySchemes: op.securitySchemes },
-                paths: {
-                  [path]: {
-                    [op.method.toLowerCase()]: {
-                      ...op.request,
-                      parameters: swaggerParameters,
-                      operationId: op.name
+            const prepared2 = swaggerRequest(
+              swagger.buildRequest({
+                spec: {
+                  openapi: op.openapi,
+                  servers: [{ url: op.baseUrl }],
+                  components: { securitySchemes: op.securitySchemes },
+                  paths: {
+                    [path]: {
+                      [op.method.toLowerCase()]: {
+                        ...op.request,
+                        parameters: swaggerParameters,
+                        operationId: op.name
+                      }
                     }
                   }
-                }
-              },
-              operationId: op.name,
-              pathName: path,
-              method: op.method.toLowerCase(),
-              parameters,
-              securities: { authorized },
-              ...contentType2 === void 0 ? {} : { requestContentType: contentType2 },
-              ...body === void 0 ? {} : { requestBody: body }
+                },
+                operationId: op.name,
+                pathName: path,
+                method: op.method.toLowerCase(),
+                parameters,
+                securities: { authorized },
+                ...contentType2 === void 0 ? {} : { requestContentType: contentType2 },
+                ...body === void 0 ? {} : { requestBody: body }
+              })
+            );
+            const pathname = prepared2.url.replace(/^[^:]+:\/\/[^/]*/, "").split(/[?#]/)[0] ?? "";
+            if (pathname.split("/").some((segment) => /^(?:\.|%2e){1,2}$/i.test(segment)))
+              throw new Error("This path value would change the request path");
+            const url = new URL(prepared2.url);
+            if (querystrings.length > 0)
+              url.search = [url.search.slice(1), ...querystrings].filter((part) => part !== "").join("&");
+            const origin = new URL(op.baseUrl).origin;
+            if (url.origin !== origin || !operationPath(op).test(url.pathname) || url.username || url.password)
+              throw new Error("The request escaped its API operation");
+            const headers = new Headers(prepared2.headers);
+            if (!headers.has("user-agent")) headers.set("user-agent", "Executor");
+            if (prepared2.body instanceof FormData) headers.delete("content-type");
+            return { ...prepared2, url, headers };
+          },
+          catch: () => new OpenapiError({ reason: "invalid_input", operation })
+        });
+        const client = yield* HttpClient_exports.HttpClient;
+        const request = yield* Effect_exports.try({
+          try: () => HttpClientRequest_exports.fromWeb(
+            new Request(prepared.url, {
+              method: prepared.method,
+              headers: prepared.headers,
+              ...prepared.body === void 0 ? {} : { body: prepared.body }
             })
-          );
-          const pathname = prepared2.url.replace(/^[^:]+:\/\/[^/]*/, "").split(/[?#]/)[0] ?? "";
-          if (pathname.split("/").some((segment) => /^(?:\.|%2e){1,2}$/i.test(segment)))
-            throw new Error("This path value would change the request path");
-          const url = new URL(prepared2.url);
-          if (querystrings.length > 0)
-            url.search = [url.search.slice(1), ...querystrings].filter((part) => part !== "").join("&");
-          const origin = new URL(op.baseUrl).origin;
-          if (url.origin !== origin || !operationPath(op).test(url.pathname) || url.username || url.password)
-            throw new Error("The request escaped its API operation");
-          const headers = new Headers(prepared2.headers);
-          if (!headers.has("user-agent")) headers.set("user-agent", "Executor");
-          if (prepared2.body instanceof FormData) headers.delete("content-type");
-          return { ...prepared2, url, headers };
-        },
-        catch: () => new OpenapiError({ reason: "invalid_input" })
-      });
-      const client = yield* HttpClient_exports.HttpClient;
-      const request = yield* Effect_exports.try({
-        try: () => HttpClientRequest_exports.fromWeb(
-          new Request(prepared.url, {
-            method: prepared.method,
-            headers: prepared.headers,
-            ...prepared.body === void 0 ? {} : { body: prepared.body }
-          })
-        ),
-        catch: () => new OpenapiError({ reason: "invalid_input" })
-      });
-      const response = yield* HttpClient_exports.withScope(client).execute(request);
-      yield* failOnNetworkRefusal(response);
-      if (response.status < 200 || response.status >= 300) {
-        const provider = httpProviderError(response.status, response.headers);
-        if (provider !== void 0 && provider.reason !== "rejected") return yield* provider;
-        const declared = yield* responseError(response, errors);
-        return yield* declared ?? provider ?? new OpenapiError({ reason: "request", status: response.status });
-      }
-      if (response.status === 204 || prepared.method === "HEAD") return null;
-      const contentType = response.headers["content-type"] ?? "text/plain";
-      const chunks = yield* response.stream.pipe(
-        Stream_exports.mapError(() => new OpenapiError({ reason: "request" })),
-        Stream_exports.limitBytes(
-          defaultOpenapiResponseLimits.maxBodyBytes,
-          () => Stream_exports.fail(new OpenapiError({ reason: "request" }))
-        ),
-        Stream_exports.runCollect,
-        Effect_exports.timeout(defaultOpenapiResponseLimits.readTimeoutMs),
-        Effect_exports.withSpan("provider.http.response.read")
-      );
-      const data = new Uint8Array(chunks.reduce((size, chunk) => size + chunk.length, 0));
-      let offset = 0;
-      for (const chunk of chunks) {
-        data.set(chunk, offset);
-        offset += chunk.length;
-      }
-      if (!isOpenapiTextMedia(contentType))
-        return { base64: Encoding_exports.encodeBase64(data), contentType };
-      const text = new TextDecoder().decode(data);
-      return contentType.includes("json") && !isOpenapiJsonSequence(contentType) ? yield* Schema_exports.decodeUnknownEffect(Schema_exports.fromJsonString(Schema_exports.Json))(text) : text;
-    })
-  ).pipe(
-    Effect_exports.withSpan("provider.openapi.call", {
-      attributes: { "executor.tool.name": op.name, "http.request.method": op.method }
-    }),
-    Effect_exports.provideService(FetchHttpClient_exports.RequestInit, { redirect: "manual" }),
-    Effect_exports.provide(FetchHttpClient_exports.layer),
-    Effect_exports.mapError(
-      (error) => error instanceof ProviderError && account?.id !== void 0 ? accountProviderError(error, account.id) : error instanceof OpenapiError || error instanceof OpenapiResponseError || error instanceof ProviderError || error instanceof NetworkRefused ? error : new OpenapiError({ reason: "request" })
-    )
-  );
+          ),
+          catch: () => new OpenapiError({ reason: "invalid_input", operation })
+        });
+        const response = yield* HttpClient_exports.withScope(client).execute(request);
+        yield* failOnNetworkRefusal(response);
+        if (response.status < 200 || response.status >= 300) {
+          const provider = httpProviderError(response.status, response.headers);
+          if (provider !== void 0 && provider.reason !== "rejected") return yield* provider;
+          const declared = yield* responseError(response, errors);
+          return yield* declared ?? provider ?? new OpenapiError({ reason: "request", operation, ...responseShape(response) });
+        }
+        if (response.status === 204 || prepared.method === "HEAD") return null;
+        const unreadable = new OpenapiError({
+          reason: "request",
+          operation,
+          ...responseShape(response)
+        });
+        const contentType = response.headers["content-type"] ?? "text/plain";
+        const chunks = yield* response.stream.pipe(
+          Stream_exports.mapError(() => unreadable),
+          Stream_exports.limitBytes(
+            defaultOpenapiResponseLimits.maxBodyBytes,
+            () => Stream_exports.fail(unreadable)
+          ),
+          Stream_exports.runCollect,
+          Effect_exports.timeoutOrElse({
+            duration: defaultOpenapiResponseLimits.readTimeoutMs,
+            orElse: () => Effect_exports.fail(unreadable)
+          }),
+          Effect_exports.withSpan("provider.http.response.read")
+        );
+        const data = new Uint8Array(chunks.reduce((size, chunk) => size + chunk.length, 0));
+        let offset = 0;
+        for (const chunk of chunks) {
+          data.set(chunk, offset);
+          offset += chunk.length;
+        }
+        if (!isOpenapiTextMedia(contentType))
+          return { base64: Encoding_exports.encodeBase64(data), contentType };
+        const text = new TextDecoder().decode(data);
+        return contentType.includes("json") && !isOpenapiJsonSequence(contentType) ? yield* Schema_exports.decodeUnknownEffect(Schema_exports.fromJsonString(Schema_exports.Json))(text).pipe(
+          Effect_exports.mapError(() => unreadable)
+        ) : text;
+      })
+    ).pipe(
+      Effect_exports.withSpan("provider.openapi.call", {
+        attributes: { "executor.tool.name": op.name, "http.request.method": op.method }
+      }),
+      Effect_exports.provideService(FetchHttpClient_exports.RequestInit, { redirect: "manual" }),
+      Effect_exports.provide(FetchHttpClient_exports.layer),
+      Effect_exports.mapError(
+        (error) => error instanceof ProviderError && account?.id !== void 0 ? accountProviderError(error, account.id) : error instanceof OpenapiError || error instanceof OpenapiResponseError || error instanceof ProviderError || error instanceof NetworkRefused ? error : new OpenapiError({ reason: "request", operation })
+      )
+    );
+  };
   return {
     available: (op, account) => selectedCredentials(op, account) !== void 0,
     call
@@ -514,7 +542,12 @@ var openapiToolsEffect = (options, prepared) => Effect_exports.gen(function* ()
         run: (_context, value) => Schema_exports.decodeUnknownEffect(input)(
           fillParameterDefaults(op, config.parameterDefaults, value)
         ).pipe(
-          Effect_exports.mapError(() => new OpenapiError({ reason: "invalid_input" })),
+          Effect_exports.mapError(
+            () => new OpenapiError({
+              reason: "invalid_input",
+              operation: { method: op.method, path: op.path }
+            })
+          ),
           Effect_exports.flatMap(
             (parsed) => request.call(op, parsed, config.account, errors).pipe(
               Effect_exports.provideService(
@@ -4755,9 +4788,9 @@ var compileOpenApiDocument = (entry, inputDocument, options = {}) => {
           for (const { parameter: p, at: parameterAt } of parameters.values()) {
             const key = p.in === "header" ? "headers" : p.in;
             const group = groups.get(key) ?? { properties: {}, required: [] };
-            const [mediaType, content] = p.content === void 0 ? [] : Object.entries(p.content)[0] ?? [];
+            const [mediaType2, content] = p.content === void 0 ? [] : Object.entries(p.content)[0] ?? [];
             const schema2 = p.schema ?? (content === void 0 ? {} : record2(content).schema ?? {});
-            const schemaAt = p.schema !== void 0 || mediaType === void 0 ? `${parameterAt}/schema` : mediaSchemaAt(document, `${parameterAt}`, mediaType, content);
+            const schemaAt = p.schema !== void 0 || mediaType2 === void 0 ? `${parameterAt}/schema` : mediaSchemaAt(document, `${parameterAt}`, mediaType2, content);
             group.properties[p.name] = parameterAt === void 0 ? () => schema2 : (api) => api(schema2, schemaAt);
             if (p.required || p.in === "path") group.required.push(p.name);
             groups.set(key, group);

package/js/skills/effect.js

@@ -1,8 +1,10 @@
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "../chunk-TSLG2WPA.js";
-import "../chunk-NSBRV4FJ.js";
+} from "../chunk-4N26L465.js";
+import "../chunk-MYCVMDWI.js";
+import "../chunk-2D2PKLGQ.js";
+import "../chunk-XGN5IFOZ.js";
 import "../chunk-NXTXZ635.js";
 import "../chunk-CZ7CSFO4.js";
 export {

package/js/skills.js

@@ -5,7 +5,7 @@ import "./chunk-VUVBMNKC.js";
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "./chunk-TSLG2WPA.js";
+} from "./chunk-4N26L465.js";
 import {
   httpProviderError
 } from "./chunk-KQCMHI3K.js";
@@ -19,18 +19,19 @@ import {
   SkillLoadFailed,
   SkillServiceName,
   skillLoadLimits
-} from "./chunk-NSBRV4FJ.js";
+} from "./chunk-MYCVMDWI.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-V2I3MMPM.js";
-import {
-  HttpBody_exports,
-  HttpClient_exports
-} from "./chunk-B5YJQU45.js";
+} from "./chunk-BBTELEAN.js";
 import {
   wrap
 } from "./chunk-YML53Z7H.js";
 import "./chunk-PWF2DRJ3.js";
+import "./chunk-2D2PKLGQ.js";
+import {
+  HttpBody_exports,
+  HttpClient_exports
+} from "./chunk-XGN5IFOZ.js";
 import {
   Effect_exports,
   Ref_exports,

package/js/ui/auth.js

@@ -3,7 +3,7 @@ import {
   appRedirect,
   appSignInCallback,
   appSignInFailed
-} from "../chunk-PTUZSCEV.js";
+} from "../chunk-P46HIAX6.js";
 import {
   AppReturnPath,
   AppSignInCallback,
@@ -12,8 +12,8 @@ import {
   AppSignInId,
   appSignInCallbackPath
 } from "../chunk-WQ5MVBTP.js";
-import "../chunk-V2I3MMPM.js";
-import "../chunk-B5YJQU45.js";
+import "../chunk-BBTELEAN.js";
+import "../chunk-XGN5IFOZ.js";
 import "../chunk-NXTXZ635.js";
 import "../chunk-CZ7CSFO4.js";
 export {

package/js/ui/contracts.js

@@ -7,9 +7,10 @@ import {
   UiOperation,
   UiSnapshot,
   UiUnauthorized
-} from "../chunk-SDLIDQXG.js";
-import "../chunk-B5YJQU45.js";
+} from "../chunk-5ZHHO4OM.js";
 import "../chunk-PWF2DRJ3.js";
+import "../chunk-2D2PKLGQ.js";
+import "../chunk-XGN5IFOZ.js";
 import "../chunk-NXTXZ635.js";
 import "../chunk-CZ7CSFO4.js";
 export {

package/js/ui/serving.js

@@ -1,19 +1,20 @@
 import {
   appPrivateHeaders
-} from "../chunk-PTUZSCEV.js";
+} from "../chunk-P46HIAX6.js";
 import "../chunk-WQ5MVBTP.js";
 import {
   UiForbidden
-} from "../chunk-SDLIDQXG.js";
+} from "../chunk-5ZHHO4OM.js";
 import {
   CurrentTelemetryConfig
-} from "../chunk-YXKXKGN6.js";
-import "../chunk-V2I3MMPM.js";
+} from "../chunk-WGBI5MVX.js";
+import "../chunk-BBTELEAN.js";
+import "../chunk-PWF2DRJ3.js";
+import "../chunk-2D2PKLGQ.js";
 import {
   HttpServerRequest_exports,
   HttpServerResponse_exports
-} from "../chunk-B5YJQU45.js";
-import "../chunk-PWF2DRJ3.js";
+} from "../chunk-XGN5IFOZ.js";
 import {
   Effect_exports
 } from "../chunk-NXTXZ635.js";

package/package.json

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