apps 0.0.1-beta.24 → 0.0.1-beta.26

package/js/{chunk-IJX4CYZO.js → chunk-2TP7C25K.js}

@@ -19,10 +19,10 @@ import {
   text,
   uint8Array,
   urlParams
-} from "./chunk-UK573G7W.js";
+} from "./chunk-OBXHLFGQ.js";
 import {
   JsonValue
-} from "./chunk-27F7W2LG.js";
+} from "./chunk-KKGRSXUK.js";
 import {
   Cause,
   Defect,
@@ -118,7 +118,7 @@ import {
   transformEffect,
   transformPull,
   void_2 as void_
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-DM5U7G7V.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";

package/js/{chunk-KUMBKVJD.js → chunk-3YN4UDPB.js}

@@ -1,9 +1,9 @@
 import {
   appSignInCallbackPath
-} from "./chunk-VFZKSM3T.js";
+} from "./chunk-SUY33XAY.js";
 import {
   HttpServerResponse_exports
-} from "./chunk-UK573G7W.js";
+} from "./chunk-OBXHLFGQ.js";
 
 // src/implementation/ui-auth.ts
 var appPrivateHeaders = {

package/js/{chunk-B3T7CZOH.js → chunk-4CMJD7AB.js}

@@ -1,9 +1,12 @@
 import {
   prepareElicitation
-} from "./chunk-3HH4OZR3.js";
+} from "./chunk-BTRBOOTD.js";
 import {
   fromPromise
-} from "./chunk-S47NFEWF.js";
+} from "./chunk-WPKXOTKM.js";
+import {
+  bodyUpstreamError
+} from "./chunk-DAIW2WM3.js";
 import {
   ElicitationFailed,
   McpError,
@@ -15,15 +18,15 @@ import {
   defaultElicitationLimits,
   defaultMcpClientLimits,
   mcpSdkTimerCeilingMs
-} from "./chunk-2KZ7GG43.js";
+} from "./chunk-VGEPL4BV.js";
 import {
   jsonSchemaDecoder,
   nestJsonSchema,
   preparedJsonSchemaDecoder
-} from "./chunk-66JAEDTE.js";
+} from "./chunk-IE6W5RNN.js";
 import {
   JsonObject
-} from "./chunk-27F7W2LG.js";
+} from "./chunk-KKGRSXUK.js";
 import {
   Clock_exports,
   Deferred_exports,
@@ -32,7 +35,7 @@ import {
   Option_exports,
   Queue_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-DM5U7G7V.js";
 
 // src/implementation/mcp-tools.ts
 var resultFields = {
@@ -128,7 +131,11 @@ var adaptMcpTools = (client) => Effect_exports.gen(function* () {
 });
 
 // src/implementation/mcp-client.ts
-import { ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import {
+  ErrorCode as ErrorCode2,
+  ListToolsResultSchema,
+  McpError as ProtocolError2
+} from "@modelcontextprotocol/sdk/types.js";
 
 // src/implementation/mcp-call.ts
 import {
@@ -257,6 +264,20 @@ var mcpCall = (client, name, input, context, timeoutMs, failure) => Effect_expor
 );
 
 // src/implementation/mcp-client.ts
+var clientCodes = /* @__PURE__ */ new Set([
+  ErrorCode2.RequestTimeout,
+  ErrorCode2.ConnectionClosed
+]);
+var answeredError = (error) => {
+  if (!(error instanceof ProtocolError2) || clientCodes.has(error.code)) return void 0;
+  const prefix = `MCP error ${error.code}: `;
+  return bodyUpstreamError({
+    error: {
+      code: error.code,
+      message: error.message.startsWith(prefix) ? error.message.slice(prefix.length) : error.message
+    }
+  });
+};
 var mcpJsonSchemaValidator = {
   getValidator(document) {
     const decoder = Effect_exports.runSync(jsonSchemaDecoder(document));
@@ -341,6 +362,7 @@ function mcpClient(withClient, timeoutMs, failure) {
 export {
   adaptMcpTool,
   adaptMcpTools,
+  answeredError,
   mcpJsonSchemaValidator,
   mcpClient
 };

package/js/{chunk-M3B3DE4K.js → chunk-AAAMPT6F.js}

@@ -3,7 +3,7 @@ import {
   invalidate,
   layer,
   mutation
-} from "./chunk-PJJ24GU7.js";
+} from "./chunk-XBG3M64K.js";
 import {
   Boolean,
   Cause,
@@ -158,7 +158,7 @@ import {
   void_2,
   whileLoop,
   zipRight
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-DM5U7G7V.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";

package/js/{chunk-3HH4OZR3.js → chunk-BTRBOOTD.js}

@@ -1,39 +1,41 @@
 import {
   makeCache
-} from "./chunk-NKLWZJLE.js";
+} from "./chunk-ZVMZWXVF.js";
 import {
   accountSecrets,
   boundFailureMessage,
   describeFailure,
   failureDetail,
+  leavingProviderError,
+  parseMcpError,
   readCatalog,
   routerSkills
-} from "./chunk-WFEUCUFF.js";
+} from "./chunk-EXDR4HVM.js";
 import {
   folderSkillsEffect
-} from "./chunk-IPI4MFSN.js";
+} from "./chunk-PC5RHPUP.js";
 import {
   ResponseStatusError,
   authorDatabase,
   isApp,
   toEffectApp,
   unavailableStorage
-} from "./chunk-A5BSZKFF.js";
+} from "./chunk-NXO2GN2T.js";
 import {
   parseDatabaseSchema
-} from "./chunk-ZQINWV4W.js";
+} from "./chunk-LPN4ONWW.js";
 import {
   declaredOperations,
   fromPromise,
   locate,
   nativeOperation,
   toPromise
-} from "./chunk-S47NFEWF.js";
+} from "./chunk-WPKXOTKM.js";
 import {
   accountProviderError,
   httpProviderError,
   parseProviderError
-} from "./chunk-MKWZPDR6.js";
+} from "./chunk-DAIW2WM3.js";
 import {
   AccountCheckResult,
   DeclaredProvider,
@@ -64,7 +66,6 @@ import {
   InvocationDeadline,
   ManualWebhookSetup,
   ManyAccounts,
-  McpError,
   NonRetryableError,
   OpenapiResponseError,
   ResolvedAccounts,
@@ -81,29 +82,29 @@ import {
   defaultWebhookTransportLimits,
   maxInputProblems,
   workflowDurationMillis
-} from "./chunk-2KZ7GG43.js";
+} from "./chunk-VGEPL4BV.js";
 import {
   CacheError
-} from "./chunk-R3EV5FTO.js";
+} from "./chunk-T7WRQJUF.js";
 import {
   AppSkills,
   SkillFile,
   SkillLoadFailed
-} from "./chunk-JU7VHODU.js";
+} from "./chunk-TACLXEAE.js";
 import {
   captureTelemetry,
   invocationFetch
-} from "./chunk-ODEIDRGW.js";
+} from "./chunk-DUEZ2XCO.js";
 import {
   decoderOf,
   importedJsonSchema,
   jsonSchemaDecoder,
   jsonSchemaDocument
-} from "./chunk-66JAEDTE.js";
+} from "./chunk-IE6W5RNN.js";
 import {
   JsonObject,
   JsonValue
-} from "./chunk-27F7W2LG.js";
+} from "./chunk-KKGRSXUK.js";
 import {
   Cause_exports,
   Clock_exports,
@@ -115,7 +116,7 @@ import {
   SchemaIssue_exports,
   Schema_exports,
   Stream_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-DM5U7G7V.js";
 
 // src/implementation/elicitation.ts
 var prepareElicitation = (input) => Effect_exports.gen(function* () {
@@ -575,9 +576,9 @@ var evaluationSafe = (work, secrets) => work.pipe(
     const error = Cause_exports.squash(cause);
     const provider = parseProviderError(error);
     const skills = parseSkillLoadFailed(error);
-    const mcp = parseMcpError(error);
+    const mcp = parseMcpError(error, secrets);
     return Effect_exports.fail(
-      Option_exports.isSome(provider) ? provider.value : Option_exports.isSome(skills) ? skills.value : Option_exports.isSome(mcp) ? mcp.value : new HostEvaluationFailed(failureDetail(error, secrets))
+      Option_exports.isSome(provider) ? leavingProviderError(provider.value, secrets, "discover") : Option_exports.isSome(skills) ? skills.value : Option_exports.isSome(mcp) ? mcp.value : new HostEvaluationFailed(failureDetail(error, secrets))
     );
   })
 );
@@ -1106,14 +1107,15 @@ function dispatch(app, request, context, signal) {
             const error = Cause_exports.squash(cause);
             const provider = parseProviderError(error);
             const response = Schema_exports.decodeUnknownOption(OpenapiResponseError)(error);
+            const mcp = parseMcpError(error, secrets);
             const failure = Schema_exports.decodeUnknownOption(ElicitationFailed)(error);
             return Effect_exports.fail(
-              Option_exports.isSome(provider) ? provider.value : Option_exports.isSome(response) ? new OpenapiResponseError({
+              Option_exports.isSome(provider) ? leavingProviderError(provider.value, secrets, "call") : Option_exports.isSome(response) ? new OpenapiResponseError({
                 code: response.value.code,
                 status: response.value.status,
                 message: response.value.message,
                 ...response.value.recovery === void 0 ? {} : { recovery: response.value.recovery }
-              }) : Option_exports.isSome(failure) ? failure.value : new HostOperationFailed(failureDetail(error, secrets))
+              }) : Option_exports.isSome(mcp) ? mcp.value : Option_exports.isSome(failure) ? failure.value : new HostOperationFailed(failureDetail(error, secrets))
             );
           }),
           Effect_exports.withSpan("app.operation.execute", {
@@ -1178,8 +1180,9 @@ function checkAccount(slots, declared, requirement, context, signal) {
         const error = Cause_exports.squash(cause);
         const status = Schema_exports.decodeUnknownOption(ResponseStatusError)(error);
         const classified = Option_exports.isSome(status) ? Option_exports.fromNullishOr(httpProviderError(status.value.status)) : parseProviderError(error);
+        const secrets = accountSecrets(context.accounts);
         return Effect_exports.fail(
-          Option_exports.isSome(classified) ? accountProviderError(classified.value, account.id) : new HostOperationFailed(failureDetail(error, accountSecrets(context.accounts)))
+          Option_exports.isSome(classified) ? leavingProviderError(accountProviderError(classified.value, account.id), secrets) : new HostOperationFailed(failureDetail(error, secrets))
         );
       }),
       Effect_exports.withSpan("app.account.check")
@@ -1202,11 +1205,6 @@ var parseSkillLoadFailed = (error) => Schema_exports.decodeUnknownOption(SkillLo
     })
   )
 );
-var parseMcpError = (error) => Schema_exports.decodeUnknownOption(McpError)(error).pipe(
-  Option_exports.map(
-    ({ phase, reason, status }) => new McpError({ phase, reason, ...status === void 0 ? {} : { status } })
-  )
-);
 var errorStatus = Match_exports.type().pipe(
   Match_exports.tagsExhaustive({
     ProviderError: () => 502,

package/js/chunk-DAIW2WM3.js

@@ -0,0 +1,118 @@
+import {
+  ProviderError,
+  maxUpstreamMessageLength
+} from "./chunk-T7WRQJUF.js";
+import {
+  AccountId
+} from "./chunk-KKGRSXUK.js";
+import {
+  Option_exports,
+  Schema_exports
+} from "./chunk-DM5U7G7V.js";
+
+// src/implementation/upstream-error.ts
+var ErrorToken = Schema_exports.String.check(Schema_exports.isPattern(/^[A-Za-z0-9._-]{1,128}$/));
+var JsonRpcError = Schema_exports.Struct({
+  error: Schema_exports.Struct({ code: Schema_exports.Int, message: Schema_exports.String })
+});
+var OAuthError = Schema_exports.Struct({
+  error: ErrorToken,
+  error_description: Schema_exports.optional(Schema_exports.String)
+});
+var bounded = (message) => message.length <= maxUpstreamMessageLength ? message : `${message.slice(0, maxUpstreamMessageLength - 1)}\u2026`;
+var isShortenedUpstream = (message) => message.length === maxUpstreamMessageLength && message.endsWith("\u2026");
+var stated = (code, message) => ({
+  code,
+  ...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 oauth = Schema_exports.decodeUnknownOption(OAuthError)(json);
+  if (Option_exports.isSome(oauth)) return stated(oauth.value.error, oauth.value.error_description);
+  return void 0;
+};
+var authParam = /([A-Za-z][A-Za-z0-9_-]*)\s*=\s*(?:"((?:[^"\\]|\\.)*)"|([^\s,"]+))/g;
+var challengeUpstreamError = (header) => {
+  const bearer = header === void 0 ? -1 : header.search(/\bBearer\b/i);
+  if (header === void 0 || bearer === -1) return void 0;
+  const params = /* @__PURE__ */ new Map();
+  for (const [, name, quoted, token] of header.slice(bearer + "Bearer".length).matchAll(authParam))
+    if (name !== void 0 && !params.has(name.toLowerCase()))
+      params.set(name.toLowerCase(), quoted?.replace(/\\(.)/g, "$1") ?? token ?? "");
+  const code = Schema_exports.decodeUnknownOption(ErrorToken)(params.get("error"));
+  return Option_exports.isNone(code) ? void 0 : stated(code.value, params.get("error_description"));
+};
+
+// src/implementation/provider-error.ts
+var providerError = ({
+  reason,
+  status,
+  accountId,
+  phase,
+  upstream
+}) => new ProviderError({
+  reason,
+  ...status === void 0 ? {} : { status },
+  ...accountId === void 0 ? {} : { accountId },
+  ...phase === void 0 ? {} : { phase },
+  ...upstream === void 0 ? {} : { upstream }
+});
+function parseProviderError(error) {
+  return Schema_exports.decodeUnknownOption(ProviderError)(error).pipe(Option_exports.map(providerError));
+}
+function providerErrorDetail(error, detail) {
+  return providerError({
+    ...error,
+    phase: error.phase ?? detail.phase,
+    upstream: error.upstream ?? detail.upstream
+  });
+}
+function httpProviderError(status, headers = {}) {
+  const upstream = challengeUpstreamError(headers["www-authenticate"]);
+  if (status >= 500 && status <= 599)
+    return providerError({ reason: "unavailable", status, upstream });
+  if (status === 401) return providerError({ reason: "unauthorized", status, upstream });
+  if (status === 429) return providerError({ reason: "rate_limited", status, upstream });
+  if (status !== 403) return void 0;
+  const retry = headers["retry-after"];
+  if (headers["x-ratelimit-remaining"] === "0" || retry !== void 0 && (/^\d+$/.test(retry) || Number.isFinite(Date.parse(retry))))
+    return providerError({ reason: "rate_limited", status, upstream });
+  if (typeof upstream?.code === "string" && upstream.code.toLowerCase() === "insufficient_scope")
+    return providerError({ reason: "forbidden", status, upstream });
+  return providerError({ reason: "rejected", status, upstream });
+}
+function accountProviderError(error, accountId) {
+  const parsed = parseProviderError(error);
+  const account = Schema_exports.decodeUnknownOption(AccountId)(accountId);
+  if (Option_exports.isNone(parsed) || Option_exports.isNone(account)) return error;
+  return providerError({ ...parsed.value, accountId: account.value });
+}
+function graphqlProviderError(errors, status) {
+  const codes = errors.flatMap((error) => {
+    const parsed = Schema_exports.decodeUnknownOption(
+      Schema_exports.Struct({
+        type: Schema_exports.optional(Schema_exports.String),
+        extensions: Schema_exports.optional(Schema_exports.Struct({ code: Schema_exports.optional(Schema_exports.String) }))
+      })
+    )(error);
+    return Option_exports.isSome(parsed) ? [parsed.value.type, parsed.value.extensions?.code] : [];
+  });
+  if (codes.includes("RATE_LIMITED") || codes.includes("TOO_MANY_REQUESTS"))
+    return new ProviderError({ reason: "rate_limited", status });
+  if (codes.includes("UNAUTHENTICATED"))
+    return new ProviderError({ reason: "unauthorized", status });
+  if (codes.includes("FORBIDDEN")) return new ProviderError({ reason: "forbidden", status });
+  return void 0;
+}
+
+export {
+  isShortenedUpstream,
+  bodyUpstreamError,
+  providerError,
+  parseProviderError,
+  providerErrorDetail,
+  httpProviderError,
+  accountProviderError,
+  graphqlProviderError
+};