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

package/js/{chunk-J7O55ZV7.js → chunk-W7F23NQ2.js}

@@ -1,24 +1,44 @@
 import {
   makeCache
-} from "./chunk-D47C7KG5.js";
+} from "./chunk-AYM2FUI5.js";
+import {
+  accountSecrets,
+  appInvocationFetch,
+  boundFailureMessage,
+  describeFailure,
+  failureDetail,
+  leavingProviderError,
+  parseMcpError,
+  readCatalog,
+  routerSkills
+} from "./chunk-RULZPNGP.js";
 import {
   folderSkillsEffect
-} from "./chunk-FDNTX5QJ.js";
+} from "./chunk-OX233L7N.js";
 import {
+  ResponseStatusError,
   authorDatabase,
   isApp,
   toEffectApp,
   unavailableStorage
-} from "./chunk-JN55AYQH.js";
+} from "./chunk-FULRJSWU.js";
+import {
+  parseDatabaseSchema
+} from "./chunk-5JVNM3CQ.js";
 import {
+  declaredOperations,
   fromPromise,
+  locate,
   nativeOperation,
   toPromise
-} from "./chunk-PYUYJRSK.js";
+} from "./chunk-5XJR4XGW.js";
 import {
+  accountProviderError,
+  httpProviderError,
   parseProviderError
-} from "./chunk-ZJWDMTE3.js";
+} from "./chunk-4OKYLVU4.js";
 import {
+  AccountCheckResult,
   DeclaredProvider,
   DeclaredRequirements,
   ElicitationFailed,
@@ -29,6 +49,7 @@ import {
   HostError,
   HostEvaluationFailed,
   HostInputInvalid,
+  HostKindMismatch,
   HostOperationFailed,
   HostOperationNotFound,
   HostOutputInvalid,
@@ -38,6 +59,7 @@ import {
   HostToolBlocked,
   HostToolNotFound,
   HostToolPolicyFailed,
+  HostedRouter,
   HostedTool,
   HostedToolSummary,
   HostedWebhook,
@@ -45,9 +67,8 @@ import {
   InvocationDeadline,
   ManualWebhookSetup,
   ManyAccounts,
-  McpError,
   NonRetryableError,
-  OperationToolPrefixes,
+  OpenapiResponseError,
   ResolvedAccounts,
   ToolResultObservation,
   TrustedToolApproval,
@@ -62,31 +83,33 @@ import {
   defaultWebhookTransportLimits,
   maxInputProblems,
   workflowDurationMillis
-} from "./chunk-MYYEW3RA.js";
+} from "./chunk-N72RKJ5E.js";
 import {
   CacheError
-} from "./chunk-LGIYBDWA.js";
+} from "./chunk-5DLG2FVN.js";
 import {
   AppSkills,
   SkillFile,
   SkillLoadFailed
-} from "./chunk-YEJOQEII.js";
-import {
-  OpenapiResponseError
-} from "./chunk-SWPD52J7.js";
+} from "./chunk-HW3DPBZR.js";
 import {
-  captureTelemetry,
-  invocationFetch
-} from "./chunk-ZCAMUXSG.js";
+  captureTelemetry
+} from "./chunk-ETLILMHY.js";
 import {
+  allowedValues,
   decoderOf,
+  echoableKey,
   importedJsonSchema,
-  jsonSchemaDecoder
-} from "./chunk-WFSQXYUT.js";
+  jsonSchemaDecoder,
+  jsonSchemaDocument,
+  maxAlternativeKeys,
+  objectShape,
+  unionShape
+} from "./chunk-NPGRURDG.js";
 import {
   JsonObject,
   JsonValue
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-FBBXFFFJ.js";
 import {
   Cause_exports,
   Clock_exports,
@@ -95,10 +118,11 @@ import {
   Match_exports,
   Option_exports,
   Redacted_exports,
+  SchemaAST_exports,
   SchemaIssue_exports,
   Schema_exports,
   Stream_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-EXGKN554.js";
 
 // src/implementation/elicitation.ts
 var prepareElicitation = (input) => Effect_exports.gen(function* () {
@@ -139,19 +163,29 @@ var makeElicit = (handler, signal) => toPromise(
 var ApprovalDecision = Schema_exports.Literals(["approved", "denied", "user-approval"]);
 
 // src/implementation/workflow-context.ts
-var workflowSafe = (work) => work.pipe(
+var workflowSafe = (work, secrets) => work.pipe(
   Effect_exports.catchCause((cause) => {
     if (Cause_exports.hasInterrupts(cause)) return Effect_exports.interrupt;
     const error = Cause_exports.squash(cause);
     if (Schema_exports.is(WorkflowFailure)(error)) return Effect_exports.fail(error);
+    const { errorName, message } = failureDetail(error, secrets);
     return Effect_exports.fail(
       new WorkflowFailure({
         reason: "execution",
-        retryable: !(error instanceof NonRetryableError)
+        retryable: !(error instanceof NonRetryableError),
+        ...errorName === void 0 ? {} : { errorName },
+        ...message === void 0 ? {} : { message }
       })
     );
   })
 );
+var inStep = (step) => (failure) => failure.step === void 0 ? new WorkflowFailure({
+  reason: failure.reason,
+  retryable: failure.retryable,
+  step: step.slice(0, 200),
+  ...failure.errorName === void 0 ? {} : { errorName: failure.errorName },
+  ...failure.message.length === 0 ? {} : { message: failure.message }
+}) : failure;
 var makeWorkflowContext = (execution, definition, fresh, signal) => Effect_exports.gen(function* () {
   const services = yield* Effect_exports.context();
   const counts = /* @__PURE__ */ new Map();
@@ -206,25 +240,33 @@ var makeWorkflowContext = (execution, definition, fresh, signal) => Effect_expor
               Effect_exports.sync(() => new AbortController()),
               (controller2) => Effect_exports.sync(() => controller2.abort())
             );
-            const ctx = yield* fresh(stepId, AbortSignal.any([signal, controller.signal]));
+            const step2 = yield* fresh(stepId, AbortSignal.any([signal, controller.signal]));
             const result = yield* workflowSafe(
-              Effect_exports.tryPromise({ try: () => callback(ctx), catch: (error) => error })
+              Effect_exports.tryPromise({
+                try: () => callback(step2.context),
+                catch: (error) => error
+              }),
+              step2.secrets
             );
             return yield* Schema_exports.decodeUnknownEffect(WorkflowValue)(result).pipe(
               Effect_exports.mapError(
-                () => new WorkflowFailure({ reason: "output", retryable: false })
+                () => new WorkflowFailure({
+                  reason: "output",
+                  retryable: false,
+                  message: "The step returned a value that is not JSON, such as undefined, or is larger than 1 MiB. Return null for no result."
+                })
               )
             );
           })
         ).pipe(Effect_exports.provideContext(services))
       )
-    );
+    ).pipe(Effect_exports.mapError(inStep(name)));
   });
   const operationStep = (kind, name, operation, input, options) => Effect_exports.gen(function* () {
     const target = nativeOperation(operation);
-    const catalog = kind === "query" ? definition.queries : definition.mutations;
-    const match = Object.entries(catalog ?? {}).find(
-      ([, value]) => value === target && value.kind === kind
+    const root = definition.tools?.kind === "router" ? definition.tools : void 0;
+    const match = declaredOperations(root).find(
+      (entry) => entry.operation === target && entry.operation.kind === kind
     );
     if (target === void 0 || match === void 0)
       return yield* new WorkflowFailure({ reason: "operation", retryable: false });
@@ -243,9 +285,9 @@ var makeWorkflowContext = (execution, definition, fresh, signal) => Effect_expor
       parsed,
       () => attempt(
         parsed,
-        execution.invoke({ kind, name: match[0], input: args, stepId, timeout }).pipe(Effect_exports.provideContext(services))
+        execution.invoke({ kind, name: match.name, input: args, stepId, timeout }).pipe(Effect_exports.provideContext(services))
       )
-    );
+    ).pipe(Effect_exports.mapError(inStep(name)));
   });
   const invoke = (effect) => toPromise(() => effect.pipe(Effect_exports.provideContext(services)), signal)();
   const step = {
@@ -284,14 +326,91 @@ var makeWorkflowContext = (execution, definition, fresh, signal) => Effect_expor
 });
 
 // src/implementation/input-problems.ts
-var leafHook = (issue) => SchemaIssue_exports.hasInput(issue) ? "Invalid value" : SchemaIssue_exports.defaultLeafHook(issue);
+var nativeObjectShape = (ast, limit) => objectShape(
+  ast.propertySignatures.flatMap(
+    ({ name, type }) => typeof name === "string" ? [{ name, optional: SchemaAST_exports.isOptional(SchemaAST_exports.toEncoded(type)) }] : []
+  ),
+  ast.indexSignatures.length > 0,
+  limit
+);
+var unionMembers = (ast) => SchemaAST_exports.isUnion(ast) ? ast.types.flatMap(unionMembers) : SchemaAST_exports.isUndefined(ast) || SchemaAST_exports.isVoid(ast) ? [] : [ast];
+var fixedValues = (ast) => {
+  if (SchemaAST_exports.isLiteral(ast)) return [ast.literal];
+  if (SchemaAST_exports.isEnum(ast)) return ast.enums.map(([, value]) => value);
+  if (!SchemaAST_exports.isUnion(ast)) return void 0;
+  const members = unionMembers(ast).map(fixedValues);
+  return members.length > 0 && members.every((values) => values !== void 0) ? members.flat() : void 0;
+};
+var describeMember = (ast) => Match_exports.value(ast).pipe(
+  Match_exports.when(
+    SchemaAST_exports.isObjects,
+    (objects) => objects.propertySignatures.length > 0 ? nativeObjectShape(objects, maxAlternativeKeys) : "object"
+  ),
+  Match_exports.when(SchemaAST_exports.isArrays, () => "array"),
+  Match_exports.when(SchemaAST_exports.isTemplateLiteral, () => "a string matching a template"),
+  Match_exports.when(SchemaAST_exports.isString, () => "string"),
+  Match_exports.when(SchemaAST_exports.isNumber, () => "number"),
+  Match_exports.when(SchemaAST_exports.isBoolean, () => "boolean"),
+  Match_exports.when(SchemaAST_exports.isNull, () => "null"),
+  Match_exports.orElse(() => "a value with other constraints")
+);
+var memberSelector = (members) => {
+  const [first] = members;
+  if (members.length < 2 || first === void 0 || !SchemaAST_exports.isObjects(first)) return void 0;
+  return first.propertySignatures.map(({ name }) => name).find(
+    (name) => typeof name === "string" && members.every(
+      (member) => SchemaAST_exports.isObjects(member) && member.propertySignatures.some(
+        (property) => property.name === name && fixedValues(SchemaAST_exports.toEncoded(property.type)) !== void 0
+      )
+    )
+  );
+};
+var expectedUnion = (ast) => {
+  const members = unionMembers(ast);
+  const fixed = members.map(fixedValues);
+  const values = fixed.flatMap((memberValues) => memberValues === void 0 ? [] : memberValues);
+  const others = members.filter((_, index) => fixed[index] === void 0);
+  if (others.length === 0) return `Expected ${allowedValues(values)}`;
+  return `Expected ${unionShape(
+    [
+      ...values.length === 0 ? [] : [allowedValues(values)],
+      ...new Set(others.map(describeMember))
+    ],
+    memberSelector(members)
+  )}`;
+};
+var leafHook = (issue) => SchemaIssue_exports.hasInput(issue) ? "Invalid value" : Match_exports.value(issue).pipe(
+  Match_exports.tag("InvalidType", ({ ast }) => {
+    const values = fixedValues(ast);
+    return values !== void 0 ? `Expected ${allowedValues(values)}` : SchemaAST_exports.isObjects(ast) && ast.propertySignatures.length > 0 ? `Expected ${nativeObjectShape(ast)}` : SchemaIssue_exports.defaultLeafHook(issue);
+  }),
+  Match_exports.orElse(SchemaIssue_exports.defaultLeafHook)
+);
 var checkHook = (issue) => SchemaIssue_exports.hasInput(issue) || SchemaIssue_exports.hasInput(issue.issue) ? SchemaIssue_exports.defaultCheckHook(issue) ?? "Invalid value" : SchemaIssue_exports.defaultCheckHook(issue);
 var format = SchemaIssue_exports.makeFormatterStandardSchemaV1({ leafHook, checkHook });
-var segment = (key) => typeof key === "number" ? `[${key}]` : typeof key === "string" && /^[A-Za-z_$][\w$-]{0,63}$/.test(key) ? `.${key}` : "[key]";
+var located = (issue, path) => Match_exports.value(issue).pipe(
+  Match_exports.tag("Pointer", (pointer) => located(pointer.issue, [...path, ...pointer.path])),
+  Match_exports.tag("Composite", ({ issues }) => issues.flatMap((issue2) => located(issue2, path))),
+  Match_exports.tag("Encoding", (encoding) => located(encoding.issue, path)),
+  Match_exports.tag(
+    "AnyOf",
+    ({ ast, issues }) => issues.length === 0 ? [{ path, message: expectedUnion(ast) }] : issues.flatMap((issue2) => located(issue2, path))
+  ),
+  Match_exports.orElse(
+    (issue2) => format(issue2).issues.map((problem) => ({
+      path: [
+        ...path,
+        ...(problem.path ?? []).map((key) => typeof key === "object" ? key.key : key)
+      ],
+      message: problem.message
+    }))
+  )
+);
+var segment = (key) => typeof key === "number" ? `[${key}]` : typeof key === "string" && echoableKey(key) ? `.${key}` : "[key]";
 var inputInvalid = (error) => {
   if (!Schema_exports.isSchemaError(error)) return new HostInputInvalid();
-  const problems = format(error.issue).issues.slice(0, maxInputProblems).map(({ path, message }) => {
-    const location = (path ?? []).map((key) => segment(typeof key === "object" ? key.key : key));
+  const problems = located(error.issue, []).slice(0, maxInputProblems).map(({ path, message }) => {
+    const location = path.map(segment);
     return `${location.length === 0 ? "input" : `input${location.join("")}`}: ${message}`.slice(
       0,
       512
@@ -469,7 +588,7 @@ var authorCache = (host, accounts, signal, deadline) => {
       ...options.staleFor === void 0 ? {} : { staleFor: options.staleFor },
       load: Effect_exports.acquireUseRelease(
         Effect_exports.sync(() => new AbortController()),
-        (controller) => invocationFetch(controller.signal).pipe(
+        (controller) => appInvocationFetch(controller.signal).pipe(
           Effect_exports.flatMap(
             (fetch) => fromPromise(options.load)({
               fetch,
@@ -523,6 +642,10 @@ var authorCache = (host, accounts, signal, deadline) => {
 };
 
 // src/implementation/host.ts
+var WireCatalog = Schema_exports.Struct({
+  tools: Schema_exports.Array(Schema_exports.Union([HostedTool, HostedToolSummary])),
+  routers: Schema_exports.Array(HostedRouter)
+});
 function safe2(work, failure) {
   return Effect_exports.suspend(work).pipe(
     Effect_exports.catchCause(
@@ -530,30 +653,39 @@ function safe2(work, failure) {
     )
   );
 }
-var evaluationSafe = (work) => work.pipe(
+var evaluationSafe = (work, secrets) => work.pipe(
   Effect_exports.catchCause((cause) => {
     if (Cause_exports.hasInterrupts(cause)) return Effect_exports.interrupt;
     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()
+      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))
     );
   })
 );
-function jsonSchema(decoder) {
-  const imported = importedJsonSchema(decoder);
-  if (imported !== void 0) return Schema_exports.decodeUnknownEffect(JsonObject)(imported);
-  const document = Schema_exports.toJsonSchemaDocument(decoder);
-  return Schema_exports.decodeUnknownEffect(JsonObject)({
-    ...document.schema,
-    $defs: document.definitions,
-    $schema: "https://json-schema.org/draft/2020-12/schema"
-  });
+var declarationInvalid = (summary, cause, secrets = []) => new HostDeclarationInvalid({
+  source: "app",
+  errorName: "HostDeclarationInvalid",
+  message: boundFailureMessage(
+    cause === void 0 ? summary : `${summary}: ${describeFailure(cause)}`,
+    secrets
+  )
+});
+var declarationSafe = (work, summary) => Effect_exports.suspend(work).pipe(
+  Effect_exports.catchCause(
+    (cause) => Cause_exports.hasInterrupts(cause) ? Effect_exports.interrupt : Effect_exports.fail(declarationInvalid(summary, Cause_exports.squash(cause)))
+  )
+);
+function declaredExposure(exposure) {
+  const named = (kind) => Object.entries(exposure ?? {}).filter(([, value]) => value === kind).map(([field]) => field).sort();
+  const plain = named("plain");
+  const raw = named("raw");
+  return { ...plain.length === 0 ? {} : { plain }, ...raw.length === 0 ? {} : { raw } };
 }
 function providerDeclaration(provider) {
-  return safe2(
+  return declarationSafe(
     () => Effect_exports.gen(function* () {
       const auth = /* @__PURE__ */ new Map();
       for (const [name, method] of Object.entries(provider.auth)) {
@@ -562,42 +694,50 @@ function providerDeclaration(provider) {
             auth.set(name, {
               type: "secrets",
               label: method.label,
-              fields: yield* jsonSchema(method.fields)
+              fields: yield* jsonSchemaDocument(method.fields),
+              ...declaredExposure(method.exposure)
             });
             break;
           case "oauth2":
             auth.set(name, {
               type: "oauth2",
               ...method.config,
-              response: yield* jsonSchema(method.response)
+              response: yield* jsonSchemaDocument(method.response),
+              ...declaredExposure(method.exposure)
             });
             break;
         }
       }
       return yield* Schema_exports.decodeUnknownEffect(DeclaredProvider)({
         name: provider.name,
-        auth: Object.fromEntries(auth)
+        auth: Object.fromEntries(auth),
+        // Order and repetition carry no meaning, so neither changes the provider's identity.
+        ...provider.hosts === void 0 ? {} : { hosts: [...new Set(provider.hosts)].sort() }
       });
     }),
-    new HostDeclarationInvalid()
+    `Account provider "${provider.name}" has an invalid declaration`
   );
 }
 function requirements(slots, database) {
   return Effect_exports.gen(function* () {
     const accounts = /* @__PURE__ */ new Map();
     for (const [slot, selection] of Object.entries(slots)) {
+      const provider = selection instanceof ManyAccounts ? selection.provider : selection;
       accounts.set(slot, {
         cardinality: selection instanceof ManyAccounts ? "many" : "one",
-        definition: yield* providerDeclaration(
-          selection instanceof ManyAccounts ? selection.provider : selection
-        )
+        definition: yield* providerDeclaration(provider),
+        ...provider.health === void 0 ? {} : { health: true }
       });
     }
     return yield* Schema_exports.decodeUnknownEffect(DeclaredRequirements)({
       accounts: Object.fromEntries(accounts),
       capabilities: { skills: true, toolIndex: true, skillSources: true, scheduledTools: true },
       ...database === void 0 ? {} : { database }
-    }).pipe(Effect_exports.mapError(() => new HostDeclarationInvalid()));
+    }).pipe(
+      Effect_exports.mapError(
+        (cause) => declarationInvalid("The app's account or database declarations are invalid", cause)
+      )
+    );
   });
 }
 function canonical(value) {
@@ -607,6 +747,9 @@ function canonical(value) {
   }
   return JSON.stringify(value);
 }
+function withoutHosts({ hosts: _hosts, ...provider }) {
+  return provider;
+}
 function bindAccounts(slots, declarations, context) {
   return safe2(
     () => Effect_exports.gen(function* () {
@@ -632,7 +775,7 @@ function bindAccounts(slots, declarations, context) {
         for (const account of accounts) {
           if (ids.has(account.id)) return yield* Effect_exports.fail(new HostAccountsInvalid());
           ids.add(account.id);
-          if (canonical(account.provider) !== canonical(requirement.definition) || !Object.hasOwn(provider.auth, account.method))
+          if (canonical(withoutHosts(account.provider)) !== canonical(withoutHosts(requirement.definition)) || !Object.hasOwn(provider.auth, account.method))
             return yield* Effect_exports.fail(new HostAccountsInvalid());
           const method = provider.auth[account.method];
           if (method === void 0) return yield* Effect_exports.fail(new HostAccountsInvalid());
@@ -653,17 +796,67 @@ function bindAccounts(slots, declarations, context) {
     new HostAccountsInvalid()
   );
 }
+var fetchLifetime = (signal, background) => Effect_exports.acquireRelease(
+  Effect_exports.sync(() => {
+    const controller = new AbortController();
+    let refreshes = 0;
+    let ended = false;
+    const settle = () => {
+      if (ended && refreshes === 0) controller.abort();
+    };
+    const end = () => {
+      ended = true;
+      settle();
+    };
+    signal.addEventListener("abort", end, { once: true });
+    if (signal.aborted) end();
+    const settled = Effect_exports.sync(() => {
+      refreshes -= 1;
+      settle();
+    });
+    return {
+      signal: controller.signal,
+      close: () => {
+        signal.removeEventListener("abort", end);
+        end();
+      },
+      /** Counted from the hand-off, so a refresh that has not started yet keeps the fetch. */
+      background: (task) => Effect_exports.suspend(() => {
+        refreshes += 1;
+        return background(task.pipe(Effect_exports.ensuring(settled))).pipe(
+          Effect_exports.onError(() => settled)
+        );
+      })
+    };
+  }),
+  (lifetime) => Effect_exports.sync(lifetime.close)
+);
 function dispatch(app, request, context, signal) {
   return Effect_exports.scoped(
     Effect_exports.gen(function* () {
-      if (!isApp(app)) return yield* Effect_exports.fail(new HostDeclarationInvalid());
+      if (!isApp(app))
+        return yield* Effect_exports.fail(
+          declarationInvalid("The app module's default export is not an app created by defineApp")
+        );
       const native = toEffectApp(app);
+      const secrets = accountSecrets(context.accounts);
+      const storageFailure = (error) => Effect_exports.fail(new HostOperationFailed(failureDetail(error, secrets)));
       const declared = yield* requirements(native.accounts, native.database?.schema);
-      if (request.operation === "requirements")
+      if (request.operation === "requirements") {
+        if (native.database !== void 0)
+          yield* parseDatabaseSchema(native.database.schema).pipe(
+            Effect_exports.catchTag(
+              "AppDatabaseError",
+              (cause) => Effect_exports.fail(
+                declarationInvalid("The app's account or database declarations are invalid", cause)
+              )
+            )
+          );
         return yield* safe2(
           () => Schema_exports.decodeUnknownEffect(JsonValue)(declared),
           new HostDeclarationInvalid()
         );
+      }
       const lifetime = yield* Effect_exports.acquireRelease(
         Effect_exports.sync(() => new AbortController()),
         (controller) => Effect_exports.sync(() => controller.abort())
@@ -689,6 +882,15 @@ function dispatch(app, request, context, signal) {
           return yield* new WorkflowFailure({ reason: "engine", retryable: true });
         return result;
       });
+      if (request.operation === "account-check")
+        return yield* checkAccount(
+          native.accounts,
+          declared,
+          request.requirement,
+          context,
+          invocationSignal,
+          deadline
+        ).pipe(withinDeadline);
       let running;
       let transactionOpen = false;
       const delivery = (request2, signal2) => Effect_exports.suspend(
@@ -723,9 +925,19 @@ function dispatch(app, request, context, signal) {
       const files = yield* Schema_exports.decodeUnknownEffect(Schema_exports.Array(SkillFile))(
         context.files ?? []
       ).pipe(Effect_exports.mapError(() => new HostDeclarationInvalid()));
+      let cacheCommands = 0;
+      const hostCache = context.cache ?? unavailableCache;
+      const fetching = yield* fetchLifetime(signal, hostCache.background);
       const bound = {
         cache: authorCache(
-          context.cache ?? unavailableCache,
+          {
+            ...hostCache,
+            transport: (command) => {
+              cacheCommands += 1;
+              return hostCache.transport(command);
+            },
+            background: fetching.background
+          },
           Redacted_exports.value(context.accounts),
           invocationSignal,
           deadline
@@ -736,35 +948,43 @@ function dispatch(app, request, context, signal) {
         ),
         workflows: workflowReads,
         signal: invocationSignal,
-        fetch: yield* invocationFetch(invocationSignal),
+        fetch: yield* appInvocationFetch(fetching.signal),
         elicit: makeElicit(delivery, invocationSignal)
       };
-      const definition = yield* evaluationSafe(native.evaluate(bound)).pipe(
+      const definition = yield* evaluationSafe(native.evaluate(bound), secrets).pipe(
         Effect_exports.withSpan("app.evaluate")
       );
       if (request.operation === "skills") {
         const declared2 = definition.skills ?? (yield* folderSkillsEffect({ files }).pipe(
           Effect_exports.mapError(() => new HostDeclarationInvalid())
         ));
-        const source2 = definition.dynamicSkills;
-        const dynamic = source2 === void 0 ? [] : yield* evaluationSafe(Effect_exports.suspend(source2.list)).pipe(
+        const source = definition.dynamicSkills;
+        const before = cacheCommands;
+        const dynamic = source === void 0 ? [] : yield* evaluationSafe(Effect_exports.suspend(source.list), secrets).pipe(
           Effect_exports.withSpan("app.skills.load")
         );
-        const skills = yield* Schema_exports.decodeUnknownEffect(AppSkills)([...declared2, ...dynamic]).pipe(
-          Effect_exports.mapError(() => new HostDeclarationInvalid())
-        );
-        return request.sources === true ? { skills, dynamic: source2 !== void 0 } : skills;
+        const cached = source !== void 0 && cacheCommands > before;
+        const authored = new Set([...declared2, ...dynamic].map((skill) => skill.name));
+        const routed = (yield* routerSkills(definition.tools).pipe(
+          Effect_exports.withSpan("app.skills.routers")
+        )).filter((skill) => !authored.has(skill.name));
+        const skills = yield* Schema_exports.decodeUnknownEffect(AppSkills)([
+          ...declared2,
+          ...dynamic,
+          ...routed
+        ]).pipe(Effect_exports.mapError(() => new HostDeclarationInvalid()));
+        return request.sources === true ? { skills, dynamic: source !== void 0, cached } : skills;
       }
       if (request.operation === "workflows") {
         return yield* Effect_exports.forEach(
           Object.entries(definition.workflows ?? {}),
-          ([name2, entry]) => safe2(
+          ([name, entry]) => safe2(
             () => Effect_exports.gen(function* () {
               return yield* Schema_exports.decodeUnknownEffect(HostedWorkflow)({
-                name: name2,
+                name,
                 ...entry.description === void 0 ? {} : { description: entry.description },
-                inputSchema: yield* jsonSchema(entry.input),
-                ...entry.output === void 0 ? {} : { outputSchema: yield* jsonSchema(entry.output) }
+                inputSchema: yield* jsonSchemaDocument(entry.input),
+                ...entry.output === void 0 ? {} : { outputSchema: yield* jsonSchemaDocument(entry.output) }
               });
             }),
             new HostDeclarationInvalid()
@@ -797,108 +1017,60 @@ function dispatch(app, request, context, signal) {
               new WorkflowFailure({ reason: "credentials", retryable: false })
             );
             return {
-              ...accounts,
-              cache: authorCache(
-                context.cache ?? unavailableCache,
-                Redacted_exports.value(current.accounts),
-                signal2
-              ),
-              files,
-              fetch: yield* invocationFetch(signal2),
-              signal: signal2,
-              runId: execution.runId,
-              stepId,
-              idempotencyKey: stepId
+              context: {
+                ...accounts,
+                cache: authorCache(
+                  context.cache ?? unavailableCache,
+                  Redacted_exports.value(current.accounts),
+                  signal2
+                ),
+                files,
+                fetch: yield* appInvocationFetch(signal2),
+                signal: signal2,
+                runId: execution.runId,
+                stepId,
+                idempotencyKey: stepId
+              },
+              // The resolved values, not the app's decoded fields, which may be `Redacted`.
+              secrets: accountSecrets(current.accounts)
             };
           }),
           invocationSignal
         );
-        const output = yield* workflowSafe(entry.run(workflowContext, input2));
+        const output = yield* workflowSafe(entry.run(workflowContext, input2), secrets);
         const outputSchema = entry.output;
         const decoded = outputSchema === void 0 ? output : yield* safe2(
           () => Schema_exports.decodeUnknownEffect(outputSchema)(output),
-          new WorkflowFailure({ reason: "output", retryable: false })
+          new WorkflowFailure({
+            reason: "output",
+            retryable: false,
+            message: "The workflow's result does not match its declared output schema."
+          })
         );
         return yield* safe2(
           () => Schema_exports.decodeUnknownEffect(WorkflowValue)(decoded),
-          new WorkflowFailure({ reason: "output", retryable: false })
+          new WorkflowFailure({
+            reason: "output",
+            retryable: false,
+            message: "The workflow returned a value that is not JSON, such as undefined, or is larger than 1 MiB. Return null for no result."
+          })
         );
       }
       if (request.operation === "inspect") {
         const summary = request.detail === "summary";
-        const wanted = request.tools === void 0 ? void 0 : new Set(request.tools);
-        const metadata = [];
-        for (const [prefix, readOnly, catalog2] of [
-          [OperationToolPrefixes.query, true, definition.queries],
-          [OperationToolPrefixes.mutate, false, definition.mutations]
-        ]) {
-          for (const [name2, operation] of Object.entries(catalog2 ?? {})) {
-            if (wanted !== void 0 && !wanted.has(`${prefix}${name2}`)) continue;
-            const schedules = Object.entries(definition.schedules ?? {}).filter(([, schedule]) => schedule.tool === `${prefix}${name2}`).map(([name3, { tool: _tool, ...schedule }]) => ({ name: name3, ...schedule }));
-            if (request.scheduled === true && schedules.length === 0) continue;
-            metadata.push(
-              yield* safe2(
-                () => Effect_exports.gen(function* () {
-                  const fields = {
-                    name: `${prefix}${name2}`,
-                    schedules,
-                    description: operation.description ?? `${readOnly ? "Query" : "Mutate"} ${name2}`,
-                    ...operation.title === void 0 ? {} : { title: operation.title },
-                    readOnly,
-                    annotations: { ...operation.annotations, readOnlyHint: readOnly }
-                  };
-                  if (summary)
-                    return yield* Schema_exports.decodeUnknownEffect(HostedToolSummary)(fields);
-                  return yield* Schema_exports.decodeUnknownEffect(HostedTool)({
-                    ...fields,
-                    inputSchema: yield* jsonSchema(operation.input),
-                    ...operation.output === void 0 ? operation.outputSchema === void 0 ? {} : { outputSchema: operation.outputSchema } : { outputSchema: yield* jsonSchema(operation.output) },
-                    ...operation._meta === void 0 ? {} : { _meta: operation._meta }
-                  });
-                }),
-                new HostDeclarationInvalid()
-              )
-            );
-          }
-        }
-        const dynamic = request.scheduled === true ? void 0 : definition.dynamicTools;
-        if (dynamic !== void 0 && (wanted === void 0 || metadata.length < wanted.size)) {
-          const declared2 = new Set(metadata.map((tool2) => tool2.name));
-          const discover = () => {
-            if (summary && dynamic.summaries !== void 0) return dynamic.summaries();
-            if (wanted !== void 0 && dynamic.describe !== void 0) {
-              const describe = dynamic.describe;
-              return Effect_exports.forEach(
-                [...wanted].filter((name2) => !declared2.has(name2)),
-                (name2) => describe(name2),
-                { concurrency: "unbounded" }
-              ).pipe(Effect_exports.map((tools) => tools.filter((tool2) => tool2 !== void 0)));
-            }
-            return dynamic.list();
-          };
-          const discovered = yield* evaluationSafe(discover()).pipe(
-            Effect_exports.flatMap(
-              (value) => safe2(
-                () => summary ? Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedToolSummary))(value) : Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool))(value),
-                new HostDeclarationInvalid()
-              )
-            )
-          );
-          const names = new Set(declared2);
-          for (const tool2 of discovered) {
-            const readOnly = tool2.name.startsWith(OperationToolPrefixes.query);
-            if (!readOnly && !tool2.name.startsWith(OperationToolPrefixes.mutate) || tool2.name === OperationToolPrefixes.query || tool2.name === OperationToolPrefixes.mutate || names.has(tool2.name))
-              return yield* new HostDeclarationInvalid();
-            names.add(tool2.name);
-            if (wanted !== void 0 && !wanted.has(tool2.name)) continue;
-            metadata.push({
-              ...tool2,
-              readOnly,
-              annotations: { ...tool2.annotations, readOnlyHint: readOnly }
-            });
-          }
-        }
-        return metadata;
+        const catalog = yield* readCatalog(definition.tools, {
+          summary,
+          secrets,
+          ...request.tools === void 0 ? {} : { wanted: new Set(request.tools) },
+          ...request.scheduled === true ? { scheduled: true } : {},
+          schedules: (name) => Object.entries(definition.schedules ?? {}).filter(([, schedule]) => schedule.tool === name).map(([name2, { tool: _tool, ...schedule }]) => ({ name: name2, ...schedule }))
+        }).pipe(Effect_exports.withSpan("app.catalog.read"));
+        return yield* safe2(
+          () => Schema_exports.encodeEffect(WireCatalog)(catalog).pipe(
+            Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(JsonValue))
+          ),
+          new HostDeclarationInvalid()
+        );
       }
       if (request.operation === "webhook-complete" || request.operation === "webhook-validate" || request.operation === "webhooks" || request.operation === "webhook-register" || request.operation === "webhook-handle" || request.operation === "webhook-unregister") {
         const executeWebhook = (db) => dispatchWebhook(
@@ -922,25 +1094,22 @@ function dispatch(app, request, context, signal) {
         const storage2 = context.storage ?? unavailableStorage;
         return yield* storage2.mutate(native.database.schema, executeWebhook).pipe(
           Effect_exports.catchTags({
-            AppDatabaseError: () => Effect_exports.fail(new HostOperationFailed()),
-            AppStorageUnavailable: () => Effect_exports.fail(new HostOperationFailed()),
-            AppStorageError: () => Effect_exports.fail(new HostOperationFailed())
+            AppDatabaseError: storageFailure,
+            DatabaseLimitExceeded: (error) => Effect_exports.fail(error),
+            AppStorageUnavailable: storageFailure,
+            AppStorageError: storageFailure
           })
         );
       }
-      const kind = request.operation === "call" ? request.tool.startsWith(OperationToolPrefixes.query) ? "query" : request.tool.startsWith(OperationToolPrefixes.mutate) ? "mutate" : void 0 : request.operation;
-      if (kind === void 0) return yield* new HostToolNotFound();
-      const name = request.operation === "call" ? request.tool.slice(OperationToolPrefixes[kind].length) : request.name;
-      const toolName = `${OperationToolPrefixes[kind]}${name}`;
-      const catalog = kind === "query" ? definition.queries : definition.mutations;
-      const declaredTool = catalog !== void 0 && Object.hasOwn(catalog, name) ? catalog[name] : void 0;
-      const source = definition.dynamicTools;
-      const resolvedTool = source === void 0 || declaredTool !== void 0 ? void 0 : yield* evaluationSafe(source.resolve(toolName));
-      const tool = declaredTool ?? resolvedTool;
-      if (tool !== void 0 && tool.kind !== (kind === "query" ? "query" : "mutation"))
-        return yield* new HostDeclarationInvalid();
+      const toolName = request.operation === "call" ? request.tool : request.name;
+      const location = locate(definition.tools, toolName);
+      const tool = location === void 0 ? void 0 : location.kind === "operation" ? location.operation : yield* evaluationSafe(location.source.resolve(location.name), secrets);
       if (tool === void 0)
         return yield* request.operation === "call" ? new HostToolNotFound() : new HostOperationNotFound();
+      const requested = request.operation === "call" ? request.kind : request.operation === "query" ? "query" : "mutation";
+      if (requested !== void 0 && tool.kind !== requested)
+        return yield* new HostKindMismatch({ tool: toolName, requested, actual: tool.kind });
+      const kind = tool.kind === "query" ? "query" : "mutate";
       const input = yield* Effect_exports.suspend(
         () => Schema_exports.decodeUnknownEffect(tool.input)(request.input)
       ).pipe(
@@ -994,7 +1163,7 @@ function dispatch(app, request, context, signal) {
         transactionOpen = db !== void 0;
         const output = yield* Effect_exports.gen(function* () {
           running = yield* captureTelemetry;
-          const fetch = yield* invocationFetch(invocationSignal);
+          const fetch = yield* appInvocationFetch(fetching.signal);
           return yield* tool.run(
             {
               ...bound,
@@ -1022,14 +1191,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()
+              }) : Option_exports.isSome(mcp) ? mcp.value : Option_exports.isSome(failure) ? failure.value : new HostOperationFailed(failureDetail(error, secrets))
             );
           }),
           Effect_exports.withSpan("app.operation.execute", {
@@ -1060,14 +1230,61 @@ function dispatch(app, request, context, signal) {
         )
       ).pipe(
         Effect_exports.catchTags({
-          AppDatabaseError: () => Effect_exports.fail(new HostOperationFailed()),
-          AppStorageUnavailable: () => Effect_exports.fail(new HostOperationFailed()),
-          AppStorageError: () => Effect_exports.fail(new HostOperationFailed())
+          AppDatabaseError: storageFailure,
+          DatabaseLimitExceeded: (error) => Effect_exports.fail(error),
+          AppStorageUnavailable: storageFailure,
+          AppStorageError: storageFailure
         })
       );
     })
   );
 }
+function checkAccount(slots, declared, requirement, context, signal, deadline) {
+  return Effect_exports.gen(function* () {
+    const selection = Object.hasOwn(slots, requirement) ? slots[requirement] : void 0;
+    const slot = Object.hasOwn(declared.accounts, requirement) ? declared.accounts[requirement] : void 0;
+    if (selection === void 0 || slot === void 0) return yield* new HostAccountsInvalid();
+    const provider = selection instanceof ManyAccounts ? selection.provider : selection;
+    const health = provider.health;
+    if (health === void 0) return yield* new HostOperationNotFound();
+    const { accounts } = yield* bindAccounts(
+      { [requirement]: provider },
+      { accounts: { [requirement]: { ...slot, cardinality: "one" } } },
+      context
+    ).pipe(Effect_exports.withSpan("app.accounts.bind"));
+    const account = accounts[requirement];
+    if (account === void 0 || !("id" in account)) return yield* new HostAccountsInvalid();
+    const result = yield* Effect_exports.suspend(
+      () => Effect_exports.gen(function* () {
+        return yield* health.run({
+          account,
+          fetch: yield* appInvocationFetch(signal),
+          signal,
+          ...deadline === void 0 ? {} : { deadline }
+        });
+      })
+    ).pipe(
+      Effect_exports.catchCause((cause) => {
+        if (Cause_exports.hasInterrupts(cause)) return Effect_exports.interrupt;
+        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) ? leavingProviderError(accountProviderError(classified.value, account.id), secrets) : new HostOperationFailed(failureDetail(error, secrets))
+        );
+      }),
+      Effect_exports.withSpan("app.account.check")
+    );
+    return yield* safe2(
+      () => Schema_exports.decodeUnknownEffect(AccountCheckResult)(result ?? {}).pipe(
+        Effect_exports.flatMap(Schema_exports.encodeEffect(AccountCheckResult)),
+        Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(JsonValue))
+      ),
+      new HostOutputInvalid()
+    );
+  });
+}
 var parseSkillLoadFailed = (error) => Schema_exports.decodeUnknownOption(SkillLoadFailed)(error).pipe(
   Option_exports.map(
     ({ reason, message, status }) => new SkillLoadFailed({
@@ -1077,11 +1294,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,
@@ -1093,11 +1305,14 @@ var errorStatus = Match_exports.type().pipe(
     HostAccountsInvalid: () => 422,
     HostInputInvalid: () => 422,
     HostOperationNotFound: () => 404,
+    HostKindMismatch: () => 409,
     HostToolNotFound: () => 404,
     HostToolBlocked: () => 403,
     HostToolApprovalRequired: () => 409,
     HostToolPolicyFailed: () => 500,
     HostOperationFailed: () => 500,
+    DatabaseLimitExceeded: () => 422,
+    DatabaseFieldReserved: () => 422,
     HostDeclarationInvalid: () => 500,
     HostEvaluationFailed: () => 500,
     HostOutputInvalid: () => 500,
@@ -1124,6 +1339,14 @@ var createAppHandler = (app) => (request, context) => Effect_exports.gen(functio
         toolError = true;
       }
     }),
+    // Name what failed on the span; the bounded message stays in the reply only.
+    Effect_exports.tapError(
+      (error) => (error._tag === "HostEvaluationFailed" || error._tag === "HostOperationFailed" || error._tag === "HostDeclarationInvalid") && error.errorName !== void 0 ? Effect_exports.annotateCurrentSpan({
+        "error.type": error.errorName,
+        ...error.source === void 0 ? {} : { "executor.failure.source": error.source },
+        ...error.code === void 0 ? {} : { "executor.failure.code": error.code }
+      }) : Effect_exports.void
+    ),
     Effect_exports.withSpan(`app.${command.operation}`)
   );
   if (toolError)
@@ -1143,12 +1366,17 @@ var createAppHandler = (app) => (request, context) => Effect_exports.gen(functio
   ),
   Effect_exports.catchCause(
     (cause) => Cause_exports.hasInterrupts(cause) ? Effect_exports.interrupt : Effect_exports.logError(cause).pipe(
-      Effect_exports.as(
-        Response.json(
-          { ok: false, error: { _tag: "HostDeclarationInvalid" } },
-          { status: 500 }
+      Effect_exports.andThen(
+        Schema_exports.encodeEffect(HostError)(
+          declarationInvalid(
+            "The app failed while it was loaded",
+            Cause_exports.squash(cause),
+            accountSecrets(context.accounts)
+          )
         )
-      )
+      ),
+      Effect_exports.map((error) => Response.json({ ok: false, error }, { status: 500 })),
+      Effect_exports.orDie
     )
   )
 );