apps 0.0.1-beta.4 → 0.0.1-beta.6

package/js/{chunk-6VRYO2BG.js → chunk-SB4HEPNJ.js}

@@ -1,23 +1,36 @@
 import {
   makeCache
-} from "./chunk-D47C7KG5.js";
+} from "./chunk-NKLWZJLE.js";
+import {
+  accountSecrets,
+  boundFailureMessage,
+  describeFailure,
+  failureDetail,
+  readCatalog,
+  routerSkills
+} from "./chunk-MNMNLXBL.js";
 import {
   folderSkillsEffect
-} from "./chunk-FDNTX5QJ.js";
+} from "./chunk-IPI4MFSN.js";
 import {
   authorDatabase,
   isApp,
   toEffectApp,
   unavailableStorage
-} from "./chunk-DHUDODG5.js";
+} from "./chunk-OE3QQTSB.js";
+import {
+  parseDatabaseSchema
+} from "./chunk-ZQINWV4W.js";
 import {
+  declaredOperations,
   fromPromise,
+  locate,
   nativeOperation,
   toPromise
-} from "./chunk-PYUYJRSK.js";
+} from "./chunk-T7GKZBLP.js";
 import {
   parseProviderError
-} from "./chunk-ZJWDMTE3.js";
+} from "./chunk-MKWZPDR6.js";
 import {
   DeclaredProvider,
   DeclaredRequirements,
@@ -29,6 +42,7 @@ import {
   HostError,
   HostEvaluationFailed,
   HostInputInvalid,
+  HostKindMismatch,
   HostOperationFailed,
   HostOperationNotFound,
   HostOutputInvalid,
@@ -38,6 +52,7 @@ import {
   HostToolBlocked,
   HostToolNotFound,
   HostToolPolicyFailed,
+  HostedRouter,
   HostedTool,
   HostedToolSummary,
   HostedWebhook,
@@ -47,7 +62,7 @@ import {
   ManyAccounts,
   McpError,
   NonRetryableError,
-  OperationToolPrefixes,
+  OpenapiResponseError,
   ResolvedAccounts,
   ToolResultObservation,
   TrustedToolApproval,
@@ -62,31 +77,29 @@ import {
   defaultWebhookTransportLimits,
   maxInputProblems,
   workflowDurationMillis
-} from "./chunk-3M2MEDNL.js";
+} from "./chunk-B3EOZTK3.js";
 import {
   CacheError
-} from "./chunk-LGIYBDWA.js";
+} from "./chunk-R3EV5FTO.js";
 import {
   AppSkills,
   SkillFile,
   SkillLoadFailed
-} from "./chunk-YEJOQEII.js";
-import {
-  OpenapiResponseError
-} from "./chunk-SWPD52J7.js";
+} from "./chunk-JU7VHODU.js";
 import {
   captureTelemetry,
   invocationFetch
-} from "./chunk-ZCAMUXSG.js";
+} from "./chunk-RJDDBDSN.js";
 import {
   decoderOf,
   importedJsonSchema,
-  jsonSchemaDecoder
-} from "./chunk-WFSQXYUT.js";
+  jsonSchemaDecoder,
+  jsonSchemaDocument
+} from "./chunk-5T57N25Q.js";
 import {
   JsonObject,
   JsonValue
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-27F7W2LG.js";
 import {
   Cause_exports,
   Clock_exports,
@@ -98,7 +111,7 @@ import {
   SchemaIssue_exports,
   Schema_exports,
   Stream_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 
 // src/implementation/elicitation.ts
 var prepareElicitation = (input) => Effect_exports.gen(function* () {
@@ -139,19 +152,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 +229,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 +274,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 = {
@@ -523,6 +554,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,7 +565,7 @@ 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);
@@ -538,22 +573,25 @@ var evaluationSafe = (work) => work.pipe(
     const skills = parseSkillLoadFailed(error);
     const mcp = parseMcpError(error);
     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) ? provider.value : 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 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,14 +600,14 @@ function providerDeclaration(provider) {
             auth.set(name, {
               type: "secrets",
               label: method.label,
-              fields: yield* jsonSchema(method.fields)
+              fields: yield* jsonSchemaDocument(method.fields)
             });
             break;
           case "oauth2":
             auth.set(name, {
               type: "oauth2",
               ...method.config,
-              response: yield* jsonSchema(method.response)
+              response: yield* jsonSchemaDocument(method.response)
             });
             break;
         }
@@ -579,7 +617,7 @@ function providerDeclaration(provider) {
         auth: Object.fromEntries(auth)
       });
     }),
-    new HostDeclarationInvalid()
+    `Account provider "${provider.name}" has an invalid declaration`
   );
 }
 function requirements(slots, database) {
@@ -597,7 +635,11 @@ function requirements(slots, database) {
       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) {
@@ -656,14 +698,29 @@ function bindAccounts(slots, declarations, context) {
 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())
@@ -747,34 +804,40 @@ function dispatch(app, request, context, signal) {
         fetch: yield* invocationFetch(invocationSignal),
         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 source = definition.dynamicSkills;
         const before = cacheCommands;
-        const dynamic = source2 === void 0 ? [] : yield* evaluationSafe(Effect_exports.suspend(source2.list)).pipe(
+        const dynamic = source === void 0 ? [] : yield* evaluationSafe(Effect_exports.suspend(source.list), secrets).pipe(
           Effect_exports.withSpan("app.skills.load")
         );
-        const cached = source2 !== void 0 && cacheCommands > before;
-        const skills = yield* Schema_exports.decodeUnknownEffect(AppSkills)([...declared2, ...dynamic]).pipe(
-          Effect_exports.mapError(() => new HostDeclarationInvalid())
-        );
-        return request.sources === true ? { skills, dynamic: source2 !== void 0, cached } : 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()
@@ -807,108 +870,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* invocationFetch(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(
@@ -932,25 +947,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(
@@ -1039,7 +1051,7 @@ function dispatch(app, request, context, signal) {
                 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(failure) ? failure.value : new HostOperationFailed(failureDetail(error, secrets))
             );
           }),
           Effect_exports.withSpan("app.operation.execute", {
@@ -1070,9 +1082,10 @@ 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
         })
       );
     })
@@ -1103,11 +1116,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,
@@ -1153,12 +1169,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
     )
   )
 );