apps 0.0.1-beta.66 → 0.0.1-beta.67

package/js/{chunk-CKVISKCZ.js → chunk-524HNOCY.js}

@@ -11,7 +11,7 @@ import {
   parseSkillLoadFailed,
   readCatalog,
   routerSkills
-} from "./chunk-VFGI6XAL.js";
+} from "./chunk-5EOB55ID.js";
 import {
   appInvocationFetch
 } from "./chunk-T3FPHPJJ.js";
@@ -24,12 +24,12 @@ import {
   isApp,
   makeEmitter,
   toEffectApp
-} from "./chunk-NRL677QZ.js";
+} from "./chunk-5NQDJMLY.js";
 import {
   declaredOperations,
   locate,
   nativeOperation
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   accountProviderError,
   appCode,
@@ -38,7 +38,7 @@ import {
   method,
   parseProviderError,
   toPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   AccountCheckResult,
   DeclaredProvider,

package/js/{chunk-VFGI6XAL.js → chunk-5EOB55ID.js}

@@ -4,12 +4,12 @@ import {
 import {
   joinPath,
   mergeMeta
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   isShortenedUpstream,
   parseProviderError,
   providerError
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   ApiErrorResponse,
   HostDeclarationInvalid,

package/js/{chunk-NRL677QZ.js → chunk-5NQDJMLY.js}

@@ -2,11 +2,11 @@ import {
   declaredOperations,
   nativeOperation,
   nativeRouter
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   fromPromise,
   method
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   EmittedEvent,
   EventName,

package/js/{chunk-7FCKBNMS.js → chunk-6RH2UYRB.js}

@@ -1,11 +1,11 @@
 import {
   fixedRouter
-} from "./chunk-VFGI6XAL.js";
+} from "./chunk-5EOB55ID.js";
 import {
   nativeOperation,
   operationDeclaration,
   routerDeclaration
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 
 // src/implementation/protocol-operations.ts
 var protocolOperations = (operations, kinds = {}) => {

package/js/{chunk-NSEKTAGP.js → chunk-AZIV4XRH.js}

@@ -2,7 +2,7 @@ import {
   fromPromise,
   method,
   toPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   CacheError
 } from "./chunk-MWKHKOTL.js";

package/js/{chunk-O2GPP4JT.js → chunk-K2VZ3O27.js}

@@ -61,8 +61,8 @@ var toPromise = (operation, signalOf, services) => {
 
 // src/implementation/upstream-error.ts
 var ErrorToken = Schema_exports.String.check(Schema_exports.isPattern(/^[A-Za-z0-9._-]{1,128}$/u));
-var JsonRpcError = Schema_exports.Struct({
-  error: Schema_exports.Struct({ code: Schema_exports.Int, message: Schema_exports.String })
+var NestedError = Schema_exports.Struct({
+  error: Schema_exports.Struct({ code: Schema_exports.Union([Schema_exports.Int, ErrorToken]), message: Schema_exports.String })
 });
 var OAuthError = Schema_exports.Struct({
   error: ErrorToken,
@@ -75,8 +75,8 @@ var stated = (code, message) => ({
   ...message === void 0 || message === "" ? {} : { message: bounded(message) }
 });
 var bodyUpstreamError = (json) => {
-  const rpc = Schema_exports.decodeUnknownOption(JsonRpcError)(json);
-  if (Option_exports.isSome(rpc)) return stated(rpc.value.error.code, rpc.value.error.message);
+  const nested = Schema_exports.decodeUnknownOption(NestedError)(json);
+  if (Option_exports.isSome(nested)) return stated(nested.value.error.code, nested.value.error.message);
   const oauth = Schema_exports.decodeUnknownOption(OAuthError)(json);
   if (Option_exports.isSome(oauth)) return stated(oauth.value.error, oauth.value.error_description);
   return void 0;

package/js/{chunk-Y4ZPFQH6.js → chunk-WFPDJ4R3.js}

@@ -1,10 +1,10 @@
 import {
   prepareElicitation
-} from "./chunk-CKVISKCZ.js";
+} from "./chunk-524HNOCY.js";
 import {
   bodyUpstreamError,
   fromPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   ElicitationFailed,
   McpError,

package/js/{chunk-TZTLGP2Q.js → chunk-X36WUWBJ.js}

@@ -1,6 +1,6 @@
 import {
   fromPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   HostedTool,
   RouterKey,

package/js/{chunk-KB6RUFDT.js → chunk-ZA6YCHLZ.js}

@@ -3,7 +3,7 @@ import {
   answeredError,
   mcpClient,
   mcpJsonSchemaValidator
-} from "./chunk-Y4ZPFQH6.js";
+} from "./chunk-WFPDJ4R3.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-T3FPHPJJ.js";
@@ -12,7 +12,7 @@ import {
   bodyUpstreamError,
   httpProviderError,
   providerErrorDetail
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   McpCredentialsUnverified,
   McpError,

package/js/effect.js

@@ -3,14 +3,14 @@ import {
   ApprovalDecision,
   createAppHandler,
   prepareElicitation
-} from "./chunk-CKVISKCZ.js";
+} from "./chunk-524HNOCY.js";
 import "./chunk-AQU56EPI.js";
-import "./chunk-VFGI6XAL.js";
+import "./chunk-5EOB55ID.js";
 import "./chunk-T3FPHPJJ.js";
 import "./chunk-XBG7HHXC.js";
-import "./chunk-NRL677QZ.js";
-import "./chunk-TZTLGP2Q.js";
-import "./chunk-O2GPP4JT.js";
+import "./chunk-5NQDJMLY.js";
+import "./chunk-X36WUWBJ.js";
+import "./chunk-K2VZ3O27.js";
 import {
   ToolAnnotations
 } from "./chunk-TLWLJ7PD.js";

package/js/graphql.js

@@ -1,30 +1,30 @@
 import {
   catalogCache,
   catalogScope
-} from "./chunk-NSEKTAGP.js";
+} from "./chunk-AZIV4XRH.js";
 import {
   protocolOperations
-} from "./chunk-7FCKBNMS.js";
+} from "./chunk-6RH2UYRB.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-CKVISKCZ.js";
+import "./chunk-524HNOCY.js";
 import {
   cacheKey
 } from "./chunk-AQU56EPI.js";
-import "./chunk-VFGI6XAL.js";
+import "./chunk-5EOB55ID.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-T3FPHPJJ.js";
 import "./chunk-XBG7HHXC.js";
-import "./chunk-NRL677QZ.js";
+import "./chunk-5NQDJMLY.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   accountProviderError,
   graphqlProviderError,
   httpProviderError
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import "./chunk-TLWLJ7PD.js";
 import {
   NetworkRefused,

package/js/host.js

@@ -1,13 +1,13 @@
 import {
   createAppHandler
-} from "./chunk-CKVISKCZ.js";
+} from "./chunk-524HNOCY.js";
 import "./chunk-AQU56EPI.js";
-import "./chunk-VFGI6XAL.js";
+import "./chunk-5EOB55ID.js";
 import "./chunk-T3FPHPJJ.js";
 import "./chunk-XBG7HHXC.js";
-import "./chunk-NRL677QZ.js";
-import "./chunk-TZTLGP2Q.js";
-import "./chunk-O2GPP4JT.js";
+import "./chunk-5NQDJMLY.js";
+import "./chunk-X36WUWBJ.js";
+import "./chunk-K2VZ3O27.js";
 import {
   ElicitationFailed,
   ElicitationReply,

package/js/index.js

@@ -4,7 +4,7 @@ import {
   defineApp,
   event,
   workflow
-} from "./chunk-NRL677QZ.js";
+} from "./chunk-5NQDJMLY.js";
 import {
   dynamicRouter,
   mutation,
@@ -17,11 +17,11 @@ import {
   toolAnnotations,
   withApproval,
   withApprovals
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   accountProviderError,
   fromPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   CalendarSchedule,
   ElicitationFailed,

package/js/mcp/effect.js

@@ -2,17 +2,17 @@ import {
   mcpClientEffect,
   mcpHealthEffect,
   mcpToolsEffect
-} from "../chunk-KB6RUFDT.js";
-import "../chunk-Y4ZPFQH6.js";
+} from "../chunk-ZA6YCHLZ.js";
+import "../chunk-WFPDJ4R3.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-CKVISKCZ.js";
+import "../chunk-524HNOCY.js";
 import "../chunk-AQU56EPI.js";
-import "../chunk-VFGI6XAL.js";
+import "../chunk-5EOB55ID.js";
 import "../chunk-T3FPHPJJ.js";
 import "../chunk-XBG7HHXC.js";
-import "../chunk-NRL677QZ.js";
-import "../chunk-TZTLGP2Q.js";
-import "../chunk-O2GPP4JT.js";
+import "../chunk-5NQDJMLY.js";
+import "../chunk-X36WUWBJ.js";
+import "../chunk-K2VZ3O27.js";
 import "../chunk-TLWLJ7PD.js";
 import "../chunk-MWKHKOTL.js";
 import "../chunk-H72MEDMN.js";

package/js/mcp/stdio.js

@@ -3,19 +3,19 @@ import {
   answeredError,
   mcpClient,
   mcpJsonSchemaValidator
-} from "../chunk-Y4ZPFQH6.js";
+} from "../chunk-WFPDJ4R3.js";
 import {
   protocolRouter
-} from "../chunk-7FCKBNMS.js";
+} from "../chunk-6RH2UYRB.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-CKVISKCZ.js";
+import "../chunk-524HNOCY.js";
 import "../chunk-AQU56EPI.js";
-import "../chunk-VFGI6XAL.js";
+import "../chunk-5EOB55ID.js";
 import "../chunk-T3FPHPJJ.js";
 import "../chunk-XBG7HHXC.js";
-import "../chunk-NRL677QZ.js";
-import "../chunk-TZTLGP2Q.js";
-import "../chunk-O2GPP4JT.js";
+import "../chunk-5NQDJMLY.js";
+import "../chunk-X36WUWBJ.js";
+import "../chunk-K2VZ3O27.js";
 import {
   McpError,
   ProcessConfig

package/js/mcp.js

@@ -1,36 +1,36 @@
 import {
   mcpClientEffect,
   mcpHealthEffect
-} from "./chunk-KB6RUFDT.js";
+} from "./chunk-ZA6YCHLZ.js";
 import {
   catalogCache,
   catalogScope
-} from "./chunk-NSEKTAGP.js";
+} from "./chunk-AZIV4XRH.js";
 import {
   adaptMcpTool
-} from "./chunk-Y4ZPFQH6.js";
+} from "./chunk-WFPDJ4R3.js";
 import {
   protocolOperations
-} from "./chunk-7FCKBNMS.js";
+} from "./chunk-6RH2UYRB.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-CKVISKCZ.js";
+import "./chunk-524HNOCY.js";
 import {
   cacheKey
 } from "./chunk-AQU56EPI.js";
 import {
   operationDescription
-} from "./chunk-VFGI6XAL.js";
+} from "./chunk-5EOB55ID.js";
 import "./chunk-T3FPHPJJ.js";
 import "./chunk-XBG7HHXC.js";
-import "./chunk-NRL677QZ.js";
+import "./chunk-5NQDJMLY.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   fromPromise,
   method
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   McpCredentialsUnverified,
   McpError,

package/js/openapi.js

@@ -8,7 +8,7 @@ import {
 import {
   protocolOperations,
   protocolRouter
-} from "./chunk-7FCKBNMS.js";
+} from "./chunk-6RH2UYRB.js";
 import {
   OpenapiCompileError,
   OpenapiCompileErrorCode,
@@ -29,7 +29,7 @@ import {
   isOpenapiTextMedia,
   openapiBinaryResultSchema,
   openapiMediaKind
-} from "./chunk-VFGI6XAL.js";
+} from "./chunk-5EOB55ID.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-T3FPHPJJ.js";
@@ -37,14 +37,16 @@ import "./chunk-XBG7HHXC.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-TZTLGP2Q.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   accountProviderError,
+  bodyUpstreamError,
   fromPromise,
   httpProviderError,
   method,
+  providerErrorDetail,
   toPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   ApiErrorRecovery,
   ApiErrorResponse,
@@ -112,16 +114,15 @@ var responseShape = (response) => {
   };
 };
 var bodyRecovery = Schema_exports.decodeUnknownOption(Schema_exports.Struct({ recovery: ApiErrorRecovery }));
-function responseError(response, errors) {
+function errorBody(response) {
   return Effect_exports.gen(function* () {
-    const candidates = errors.filter((error) => error.status === response.status);
-    if (candidates.length === 0 || !/^application\/(?:[\w.-]+\+)?json$/i.test(
+    if (!/^application\/(?:[\w.-]+\+)?json$/i.test(
       response.headers["content-type"]?.split(";")[0]?.trim() ?? ""
     ))
       return;
     const length = response.headers["content-length"];
     if (length !== void 0 && Number(length) > defaultOpenapiErrorLimits.maxBodyBytes) return;
-    const json = yield* response.stream.pipe(
+    return yield* response.stream.pipe(
       Stream_exports.mapError(() => new OpenapiError({ reason: "request", status: response.status })),
       Stream_exports.limitBytes(
         defaultOpenapiErrorLimits.maxBodyBytes,
@@ -132,6 +133,11 @@ function responseError(response, errors) {
       Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.fromJsonString(Schema_exports.Json))),
       Effect_exports.timeout(defaultOpenapiErrorLimits.readTimeoutMs)
     );
+  }).pipe(Effect_exports.catch(() => Effect_exports.succeed(void 0)));
+}
+function responseError(status, json, errors) {
+  return Effect_exports.gen(function* () {
+    const candidates = errors.filter((error) => error.status === status);
     for (const candidate of candidates) {
       const parsed = yield* Schema_exports.decodeUnknownEffect(candidate.decoder)(json).pipe(Effect_exports.option);
       if (Option_exports.isSome(parsed)) {
@@ -142,7 +148,7 @@ function responseError(response, errors) {
         const recovery = bodyRecovery(parsed.value);
         return new OpenapiResponseError({
           code: candidate.code,
-          status: response.status,
+          status,
           message: message.value.message,
           ...Option_exports.isSome(recovery) ? { recovery: recovery.value.recovery } : {}
         });
@@ -368,8 +374,10 @@ function createRequest(config) {
         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) });
+          const json = provider !== void 0 || errors.some((error) => error.status === response.status) ? yield* errorBody(response) : void 0;
+          const declared = json === void 0 ? void 0 : yield* responseError(response.status, json, errors);
+          const upstream = json === void 0 ? void 0 : bodyUpstreamError(json);
+          return yield* declared ?? (provider === void 0 || upstream === void 0 ? provider : providerErrorDetail(provider, { upstream })) ?? new OpenapiError({ reason: "request", operation, ...responseShape(response) });
         }
         if (response.status === 204 || prepared.method === "HEAD") return null;
         const unreadable = new OpenapiError({

package/js/skills.js

@@ -1,7 +1,7 @@
 import {
   catalogCache,
   catalogScope
-} from "./chunk-NSEKTAGP.js";
+} from "./chunk-AZIV4XRH.js";
 import "./chunk-AQU56EPI.js";
 import {
   failOnNetworkRefusal
@@ -16,7 +16,7 @@ import {
   httpProviderError,
   method,
   toPromise
-} from "./chunk-O2GPP4JT.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   NetworkRefused,
   ProviderError,

package/package.json

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