apps 0.0.1-beta.1 → 0.0.1-beta.10

package/js/{chunk-RBAC33PQ.js → chunk-YXQHV65J.js}

@@ -1,78 +1,51 @@
 import {
-  parseDatabaseSchema,
   promiseTable
-} from "./chunk-PLCMJREA.js";
+} from "./chunk-ZQINWV4W.js";
 import {
+  declaredOperations,
   fromPromise,
-  nativeOperation
-} from "./chunk-PZ36XMXW.js";
+  nativeOperation,
+  nativeRouter
+} from "./chunk-Z5M2LQOZ.js";
 import {
   ScheduleTiming
-} from "./chunk-IHQ4ML7K.js";
+} from "./chunk-WLE7WX2U.js";
+import {
+  DatabaseSchema
+} from "./chunk-N7YDVXYJ.js";
 import {
   decoderOf,
   isSchema,
   storageFieldOf
-} from "./chunk-2HHMABB6.js";
+} from "./chunk-5T57N25Q.js";
 import {
   AppStorageUnavailable
-} from "./chunk-FZJOYIZO.js";
+} from "./chunk-PZB6T6KU.js";
 import {
   JsonValue
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-27F7W2LG.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 
-// ../app-cache/src/contracts/cache.ts
-var CacheError = class extends Schema_exports.TaggedError()("CacheError", {
-  reason: Schema_exports.Literals(["unavailable", "storage", "invalid", "capacity", "timeout"])
-}) {
+// src/contracts/http.ts
+var ResponseStatusError = class extends Schema_exports.TaggedError()(
+  "ResponseStatusError",
+  { status: Schema_exports.Number }
+) {
+  get message() {
+    return `Request failed with status ${this.status}`;
+  }
 };
-var cacheLimits = {
-  keyBytes: 8192,
-  entryBytes: 2e6,
-  batchBytes: 8e6,
-  batchEntries: 128,
-  totalBytes: 128e6,
-  totalEntries: 1e5,
-  retentionMs: 7 * 24 * 60 * 60 * 1e3,
-  loadTimeoutMs: 9e4,
-  leaseMs: 12e4
+var ResponseDecodeError = class extends Schema_exports.TaggedError()(
+  "ResponseDecodeError",
+  {}
+) {
+  get message() {
+    return "Response body did not match the expected schema";
+  }
 };
-var Key = Schema_exports.String.check(Schema_exports.isPattern(/^[a-f0-9]{64}$/));
-var Time = Schema_exports.Finite.check(Schema_exports.isGreaterThanOrEqualTo(0));
-var CacheEntry = Schema_exports.Struct({
-  value: Schema_exports.Json,
-  version: Schema_exports.String,
-  freshUntil: Time,
-  staleUntil: Time
-});
-var CacheCommand = Schema_exports.Union([
-  Schema_exports.Struct({ operation: Schema_exports.Literal("read"), keys: Schema_exports.Array(Key) }),
-  Schema_exports.Struct({
-    operation: Schema_exports.Literal("claim"),
-    key: Key,
-    version: Schema_exports.NullOr(Schema_exports.String)
-  }),
-  Schema_exports.Struct({
-    operation: Schema_exports.Literal("publish"),
-    key: Key,
-    lease: Schema_exports.String,
-    entry: CacheEntry
-  }),
-  Schema_exports.Struct({ operation: Schema_exports.Literal("release"), key: Key, lease: Schema_exports.String }),
-  Schema_exports.Struct({
-    operation: Schema_exports.Literal("write"),
-    entries: Schema_exports.Array(Schema_exports.Struct({ key: Key, entry: CacheEntry }))
-  }),
-  Schema_exports.Struct({ operation: Schema_exports.Literal("invalidate"), key: Key })
-]);
-var CacheReply = Schema_exports.Union([
-  Schema_exports.Struct({ ok: Schema_exports.Literal(true), value: Schema_exports.Json }),
-  Schema_exports.Struct({ ok: Schema_exports.Literal(false), error: CacheError })
-]);
 
 // src/implementation/workflows.ts
 var NativeWorkflow = /* @__PURE__ */ Symbol("apps.Workflow");
@@ -97,8 +70,12 @@ var nativeWorkflow = (value) => {
 var InternalApp = /* @__PURE__ */ Symbol("apps.App");
 var isApp = (value) => typeof value === "object" && value !== null && InternalApp in value;
 var toEffectApp = (app) => app[InternalApp];
+function rejectCatalogs(definition) {
+  if ("queries" in definition || "mutations" in definition)
+    throw new Error("Put queries and mutations in a router under tools");
+}
 function adaptDefinition(definition) {
-  if ("tools" in definition) throw new Error("Use queries and mutations instead of tools");
+  rejectCatalogs(definition);
   const webhooks = definition.webhooks === void 0 ? {} : {
     webhooks: Object.fromEntries(
       Object.entries(definition.webhooks).map(([name, webhook]) => [
@@ -114,42 +91,42 @@ function adaptDefinition(definition) {
       ])
     )
   };
-  const operations = (kind, catalog) => Object.fromEntries(
-    Object.entries(catalog).map(([name, value]) => {
-      const operation = nativeOperation(value);
-      if (operation === void 0 || operation.kind !== kind)
-        throw new Error("Invalid app data operation");
-      return [name, operation];
-    })
-  );
   const workflows = definition.workflows === void 0 ? {} : {
     workflows: Object.fromEntries(
       Object.entries(definition.workflows).map(([name, value]) => {
-        const declared = nativeWorkflow(value);
-        if (declared === void 0) throw new Error("Invalid workflow declaration");
-        return [name, declared];
+        const declared2 = nativeWorkflow(value);
+        if (declared2 === void 0) throw new Error("Invalid workflow declaration");
+        return [name, declared2];
       })
     )
   };
-  const data = {
-    ...definition.queries === void 0 ? {} : { queries: operations("query", definition.queries) },
-    ...definition.mutations === void 0 ? {} : { mutations: operations("mutation", definition.mutations) }
-  };
+  const root = definition.tools === void 0 ? void 0 : nativeRouter(definition.tools);
+  if (definition.tools !== void 0 && root === void 0)
+    throw new Error("tools must be a router");
+  const data = root === void 0 ? {} : { tools: root };
+  const declared = root?.kind === "router" ? declaredOperations(root) : [];
+  const mutations = /* @__PURE__ */ new Set();
+  for (const { operation } of declared) {
+    if (operation.kind !== "mutation") continue;
+    if (mutations.has(operation))
+      throw new Error("A mutation can be mounted at only one path in tools");
+    mutations.add(operation);
+  }
   const schedules = definition.schedules === void 0 ? {} : {
     schedules: Object.fromEntries(
       Object.entries(definition.schedules).map(([name, schedule]) => {
-        const matches = Object.entries(definition.mutations ?? {}).filter(
-          ([, operation]) => operation === schedule.operation
+        const target = nativeOperation(schedule.operation);
+        const match = declared.find(
+          ({ operation }) => operation === target && operation.kind === "mutation"
         );
-        const match = matches[0];
-        if (match === void 0 || matches.length !== 1)
-          throw new Error("A schedule must reference exactly one named mutation in this app");
+        if (match === void 0)
+          throw new Error("A schedule must reference a mutation in this app's tools");
         return [
           name,
           {
             timing: Schema_exports.decodeUnknownSync(ScheduleTiming)(schedule.timing),
             input: Schema_exports.decodeUnknownSync(JsonValue)(schedule.input),
-            tool: `mutations.${match[0]}`
+            tool: match.name
           }
         ];
       })
@@ -164,6 +141,7 @@ function adaptDefinition(definition) {
   };
 }
 var defineApp = (requirements, definition) => {
+  if (typeof definition !== "function") rejectCatalogs(definition);
   const evaluate = typeof definition === "function" ? definition : async () => definition;
   const factory = fromPromise(evaluate);
   const native = {
@@ -201,7 +179,7 @@ var serialize = (tables) => {
       }
     ])
   );
-  return Effect_exports.runSync(parseDatabaseSchema(definitions));
+  return Schema_exports.decodeUnknownSync(DatabaseSchema)(definitions);
 };
 var authorDatabase = (tables, session, signal, writable) => {
   return Object.fromEntries(
@@ -251,11 +229,8 @@ var unavailableStorage = {
 };
 
 export {
-  CacheError,
-  cacheLimits,
-  CacheEntry,
-  CacheCommand,
-  CacheReply,
+  ResponseStatusError,
+  ResponseDecodeError,
   workflow,
   isApp,
   toEffectApp,

package/js/chunk-Z5M2LQOZ.js

@@ -0,0 +1,209 @@
+import {
+  HostedTool,
+  RouterKey,
+  RouterMeta,
+  reservedRouterKeys
+} from "./chunk-WLE7WX2U.js";
+import {
+  decoderOf
+} from "./chunk-5T57N25Q.js";
+import {
+  Effect_exports,
+  Schema_exports
+} from "./chunk-CDL5PM2Q.js";
+
+// src/implementation/authoring.ts
+var NativeCallback = /* @__PURE__ */ Symbol("apps.NativeCallback");
+var fromPromise = (callback) => (...args) => {
+  if (NativeCallback in callback) {
+    const native = callback[NativeCallback];
+    return native(...args);
+  }
+  return Effect_exports.tryPromise({ try: () => callback(...args), catch: (error) => error });
+};
+var toPromise = (operation, signal) => {
+  const native = (...args) => Effect_exports.suspend(() => {
+    if (signal === void 0) return operation(...args);
+    if (signal.aborted) return Effect_exports.interrupt;
+    const cancelled = Effect_exports.callback((resume) => {
+      if (signal.aborted) {
+        resume(Effect_exports.interrupt);
+        return;
+      }
+      const abort = () => resume(Effect_exports.interrupt);
+      signal.addEventListener("abort", abort, { once: true });
+      return Effect_exports.sync(() => signal.removeEventListener("abort", abort));
+    });
+    return Effect_exports.raceFirst(
+      cancelled,
+      Effect_exports.suspend(() => operation(...args))
+    );
+  });
+  return Object.assign((...args) => Effect_exports.runPromise(native(...args)), {
+    [NativeCallback]: native
+  });
+};
+
+// src/implementation/operations.ts
+var NativeOperation = /* @__PURE__ */ Symbol("apps.Operation");
+var NativeRouterKey = /* @__PURE__ */ Symbol("apps.Router");
+var operationDeclaration = (operation) => ({
+  kind: operation.kind,
+  [NativeOperation]: operation
+});
+var nativeOperation = (value) => {
+  if (typeof value !== "object" || value === null || !(NativeOperation in value)) return void 0;
+  return value[NativeOperation];
+};
+var operationOptions = (options) => {
+  const approval = options.approval;
+  return {
+    ...options.description === void 0 ? {} : { description: options.description },
+    ...options.title === void 0 ? {} : { title: options.title },
+    ...options.annotations === void 0 ? {} : { annotations: options.annotations },
+    ...options._meta === void 0 ? {} : { _meta: options._meta },
+    input: decoderOf(options.input),
+    ...approval === void 0 ? {} : {
+      approval: (context) => Effect_exports.tryPromise({ try: async () => approval(context), catch: (error) => error })
+    }
+  };
+};
+var withApproval = (operation, approval) => ({
+  ...operation,
+  [NativeOperation]: {
+    ...operation[NativeOperation],
+    approval: (context) => Effect_exports.tryPromise({ try: async () => approval(context), catch: (error) => error })
+  }
+});
+var make = (kind, options, run) => operationDeclaration({
+  ...operationOptions(options),
+  kind,
+  // The host always validates JSON serialization, even without a stronger output declaration.
+  ...options.output === void 0 ? {} : { output: decoderOf(options.output) },
+  run: (context, input) => Effect_exports.tryPromise({
+    // SAFETY: defineApp checks the handler context against its requirements.
+    // The host validates account bindings and creates the matching storage facade.
+    try: () => run(context, input),
+    catch: (error) => error
+  })
+});
+var query = (options, run) => make("query", options, run);
+var mutation = (options, run) => make("mutation", options, run);
+
+// src/implementation/router.ts
+var routerDeclaration = (node) => ({
+  [NativeRouterKey]: node
+});
+var nativeRouter = (value) => {
+  if (typeof value !== "object" || value === null || !(NativeRouterKey in value)) return void 0;
+  return value[NativeRouterKey];
+};
+var nativeNode = (value) => nativeOperation(value) ?? nativeRouter(value);
+var metaOf = (options) => {
+  if (options === void 0) return void 0;
+  const defined = Object.fromEntries(
+    Object.entries(options).filter(([, value]) => value !== void 0)
+  );
+  return Object.keys(defined).length === 0 ? void 0 : Schema_exports.decodeUnknownSync(RouterMeta)(defined);
+};
+var mergeMeta = (base, override) => base === void 0 ? override : override === void 0 ? base : { ...base, ...override };
+function router(children, options) {
+  const meta = metaOf(options);
+  const existing = nativeRouter(children);
+  if (existing !== void 0)
+    return routerDeclaration(
+      existing.kind === "router" ? { ...existing, ...withMeta(mergeMeta(existing.meta, meta)) } : { ...existing, ...withOverrides(mergeMeta(existing.overrides, meta)) }
+    );
+  const nodes = {};
+  for (const [key, value] of Object.entries(children)) {
+    if (reservedRouterKeys.has(key)) throw new Error(`Router key "${key}" is reserved`);
+    if (!Schema_exports.is(RouterKey)(key))
+      throw new Error(`Router key "${key}" must start with a letter or _ and contain no dots`);
+    const node = nativeNode(value);
+    if (node === void 0)
+      throw new Error(`Router key "${key}" must be a query, mutation or router`);
+    nodes[key] = node;
+  }
+  return routerDeclaration({ kind: "router", ...withMeta(meta), children: nodes });
+}
+var withMeta = (meta) => meta === void 0 ? {} : { meta };
+var withOverrides = (overrides) => overrides === void 0 ? {} : { overrides };
+var dynamicRouter = (source) => {
+  const meta = source.meta;
+  return routerDeclaration({
+    kind: "dynamic",
+    ...meta === void 0 ? {} : {
+      meta: () => fromPromise(async () => meta())().pipe(
+        Effect_exports.flatMap((options) => Schema_exports.decodeUnknownEffect(RouterMeta)(options))
+      )
+    },
+    list: () => fromPromise(async () => source.list())().pipe(
+      Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool)))
+    ),
+    resolve: (name) => fromPromise(async () => source.resolve(name))().pipe(
+      Effect_exports.map((value) => {
+        if (value === void 0) return void 0;
+        const operation = nativeOperation(value);
+        if (operation === void 0) throw new Error("Expected an operation declaration");
+        return operation;
+      })
+    )
+  });
+};
+var joinPath = (path, name) => path === "" ? name : `${path}.${name}`;
+var locate = (root, name) => {
+  if (root?.kind === "dynamic") return { kind: "dynamic", source: root, router: "", name };
+  let current = root;
+  let path = "";
+  let rest = name;
+  while (current !== void 0) {
+    const dot = rest.indexOf(".");
+    const key = dot < 0 ? rest : rest.slice(0, dot);
+    const child = Object.hasOwn(current.children, key) ? current.children[key] : void 0;
+    if (child === void 0) return void 0;
+    const remaining = dot < 0 ? void 0 : rest.slice(dot + 1);
+    switch (child.kind) {
+      case "query":
+      case "mutation":
+        return remaining === void 0 ? { kind: "operation", operation: child, router: path } : void 0;
+      case "dynamic":
+        return remaining === void 0 || remaining === "" ? void 0 : { kind: "dynamic", source: child, router: joinPath(path, key), name: remaining };
+      case "router":
+        if (remaining === void 0) return void 0;
+        current = child;
+        path = joinPath(path, key);
+        rest = remaining;
+    }
+  }
+  return void 0;
+};
+var declaredOperations = (root, path = "") => Object.entries(root?.children ?? {}).flatMap(([key, child]) => {
+  const name = joinPath(path, key);
+  switch (child.kind) {
+    case "query":
+    case "mutation":
+      return [{ name, router: path, operation: child }];
+    case "router":
+      return declaredOperations(child, name);
+    case "dynamic":
+      return [];
+  }
+});
+
+export {
+  fromPromise,
+  toPromise,
+  operationDeclaration,
+  nativeOperation,
+  withApproval,
+  query,
+  mutation,
+  routerDeclaration,
+  nativeRouter,
+  mergeMeta,
+  router,
+  dynamicRouter,
+  joinPath,
+  locate,
+  declaredOperations
+};

package/js/{chunk-PLCMJREA.js → chunk-ZQINWV4W.js}

@@ -1,5 +1,7 @@
 import {
   AppDatabaseError,
+  DatabaseFieldReserved,
+  DatabaseLimitExceeded,
   DatabaseLimits,
   DatabaseOperation,
   DatabaseSchema,
@@ -8,18 +10,21 @@ import {
   Row,
   RowMetadata,
   defaultDatabaseLimits,
-  defaultDatabaseRuntimeLimits
-} from "./chunk-BMOIAIVR.js";
+  defaultDatabaseRuntimeLimits,
+  reservedFieldNames
+} from "./chunk-N7YDVXYJ.js";
 import {
+  Cause_exports,
   Clock_exports,
   Effect_exports,
   Encoding_exports,
   Schema_exports,
   Semaphore_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 
 // ../app-data/src/implementation/schema.ts
-var metadata = /* @__PURE__ */ new Set(["id", "createdAt", "updatedAt"]);
+var metadata = new Set(reservedFieldNames);
+var reserved = (name) => metadata.has(name);
 var indexesFor = (table) => [{ name: "by_creation", fields: [] }, ...table.indexes].map((index) => ({
   name: index.name,
   fields: [
@@ -33,23 +38,25 @@ var validScalar = (field, value) => field.kind === "number" ? typeof value === "
   return point !== void 0 && point >= 55296 && point <= 57343;
 });
 var parseDatabaseSchema = (input) => Schema_exports.decodeUnknownEffect(DatabaseSchema)(input).pipe(
+  Effect_exports.mapError(() => new AppDatabaseError({ reason: "schema" })),
   Effect_exports.flatMap(
     (schema) => Effect_exports.gen(function* () {
-      for (const table of Object.values(schema)) {
-        if (Object.keys(table.fields).some((name) => metadata.has(name)) || new Set(table.indexes.map((index) => index.name)).size !== table.indexes.length)
+      for (const [name, table] of Object.entries(schema)) {
+        const field = Object.keys(table.fields).find(reserved);
+        if (field !== void 0) return yield* new DatabaseFieldReserved({ table: name, field });
+        if (new Set(table.indexes.map((index) => index.name)).size !== table.indexes.length)
           return yield* new AppDatabaseError({ reason: "schema" });
-        for (const field of Object.values(table.fields)) {
-          if ((field.kind === "id" ? field.references === void 0 : field.references !== void 0) || field.default !== void 0 && !validScalar(field, field.default) || field.references !== void 0 && !Object.hasOwn(schema, field.references))
+        for (const field2 of Object.values(table.fields)) {
+          if ((field2.kind === "id" ? field2.references === void 0 : field2.references !== void 0) || field2.default !== void 0 && !validScalar(field2, field2.default) || field2.references !== void 0 && !Object.hasOwn(schema, field2.references))
             return yield* new AppDatabaseError({ reason: "schema" });
         }
         for (const index of table.indexes)
-          if (index.name === "by_creation" || new Set(index.fields).size !== index.fields.length || index.fields.some((name) => fieldFor(table, name) === void 0))
+          if (index.name === "by_creation" || new Set(index.fields).size !== index.fields.length || index.fields.some((name2) => fieldFor(table, name2) === void 0))
             return yield* new AppDatabaseError({ reason: "schema" });
       }
       return schema;
     })
-  ),
-  Effect_exports.mapError(() => new AppDatabaseError({ reason: "schema" }))
+  )
 );
 var canonicalSchema = (schema) => JSON.stringify(
   Object.fromEntries(
@@ -248,7 +255,12 @@ var decodeBody = Schema_exports.decodeUnknownEffect(Schema_exports.fromJsonStrin
 var storageError = () => new AppDatabaseError({ reason: "storage" });
 var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
   const { sql, crypto } = options;
-  const schema = yield* parseDatabaseSchema(options.schema);
+  const schema = yield* parseDatabaseSchema(options.schema).pipe(
+    Effect_exports.catchTag(
+      "DatabaseFieldReserved",
+      () => Effect_exports.fail(new AppDatabaseError({ reason: "schema" }))
+    )
+  );
   const limits = yield* Schema_exports.decodeUnknownEffect(DatabaseLimits)(
     options.limits ?? defaultDatabaseLimits
   ).pipe(Effect_exports.mapError(() => new AppDatabaseError({ reason: "limit" })));
@@ -295,7 +307,13 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
       };
       const charge = (name, amount) => Effect_exports.suspend(() => {
         used[name] += amount;
-        return used[name] > limits[name] ? Effect_exports.fail(new AppDatabaseError({ reason: "limit" })) : Effect_exports.void;
+        return used[name] > limits[name] ? Effect_exports.fail(
+          new DatabaseLimitExceeded({
+            limit: name,
+            maximum: limits[name],
+            requested: used[name]
+          })
+        ) : Effect_exports.void;
       });
       const get = (table, id) => Effect_exports.gen(function* () {
         yield* charge("directGets", 1);
@@ -312,8 +330,13 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
       const store = (tableName, table, row) => Effect_exports.gen(function* () {
         const meta = yield* Schema_exports.decodeUnknownEffect(RowMetadata)(row);
         const body = JSON.stringify(row);
-        if (new TextEncoder().encode(body).length > limits.valueBytes)
-          return yield* new AppDatabaseError({ reason: "limit" });
+        const bytes = new TextEncoder().encode(body).length;
+        if (bytes > limits.valueBytes)
+          return yield* new DatabaseLimitExceeded({
+            limit: "valueBytes",
+            maximum: limits.valueBytes,
+            requested: bytes
+          });
         const keys = yield* Effect_exports.forEach(
           indexesFor(table),
           (index) => encodeIndexKey(
@@ -384,9 +407,14 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
               const bounds = yield* queryBounds(table, plan, limits.indexBytes);
               reads.add(tableName);
               yield* charge("scanCalls", 1);
-              const maximum = terminal.kind === "count" ? limits.rowsRead - used.rowsRead : limits.rowsReturned - used.rowsReturned;
-              const count = terminal.kind === "first" ? 1 : terminal.kind === "take" ? terminal.count : terminal.kind === "paginate" ? terminal.numItems : maximum;
-              if (count > maximum) return yield* new AppDatabaseError({ reason: "limit" });
+              const remaining = terminal.kind === "count" ? limits.rowsRead - used.rowsRead : limits.rowsReturned - used.rowsReturned;
+              const count = terminal.kind === "first" ? 1 : terminal.kind === "take" ? terminal.count : terminal.kind === "paginate" ? terminal.numItems : remaining;
+              if ((terminal.kind === "take" || terminal.kind === "paginate") && count > limits.rowsReturned)
+                return yield* new DatabaseLimitExceeded({
+                  limit: "pageSize",
+                  maximum: limits.rowsReturned,
+                  requested: count
+                });
               if (count === 0 && terminal.kind === "take") return [];
               const query = yield* fingerprint(
                 crypto,
@@ -412,7 +440,10 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
                   plan.order === "asc" ? sql`i.sort_key > ${position}` : sql`i.sort_key < ${position}`
                 );
               const direction = plan.order === "asc" ? sql.literal("ASC") : sql.literal("DESC");
-              const limit = terminal.kind === "first" || terminal.kind === "take" ? count : count + 1;
+              const limit = Math.min(
+                terminal.kind === "first" || terminal.kind === "take" ? count : count + 1,
+                remaining + 1
+              );
               if (terminal.kind === "count") {
                 const rows2 = yield* sql`SELECT i.sort_key FROM app_indexes i WHERE ${sql.and(predicates)} ORDER BY i.sort_key ${direction} LIMIT ${limit}`.pipe(
                   Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(CountRow)))
@@ -436,7 +467,11 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
                 )
               );
               if (terminal.kind === "collect" && rows.length > count)
-                return yield* new AppDatabaseError({ reason: "limit" });
+                return yield* new DatabaseLimitExceeded({
+                  limit: "rowsReturned",
+                  maximum: limits.rowsReturned,
+                  requested: used.rowsReturned + rows.length
+                });
               const page = rows.slice(0, count);
               yield* charge("rowsReturned", page.length);
               const values = yield* Effect_exports.forEach(page, (row) => decodeBody(row.body));
@@ -502,6 +537,11 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
         })
       };
       return yield* Effect_exports.suspend(() => work(session)).pipe(
+        // A failed database call poisons the session. Report that failure even when
+        // authored code caught it or threw something else in its place.
+        Effect_exports.catchCause(
+          (cause) => failed === void 0 || Cause_exports.hasInterrupts(cause) ? Effect_exports.failCause(cause) : Effect_exports.fail(failed)
+        ),
         Effect_exports.tap(
           () => gate.withPermits(1)(
             Effect_exports.suspend(() => failed === void 0 ? Effect_exports.void : Effect_exports.fail(failed))

package/js/client.js

@@ -4,37 +4,36 @@ import {
   UiContext,
   UiDeploymentChanged,
   UiFailed
-} from "./chunk-OHRT55C4.js";
+} from "./chunk-IJX4CYZO.js";
 import {
   AsyncResult_exports,
   AtomRegistry_exports,
   Atom_exports,
   queryResult
-} from "./chunk-EVJUVWN2.js";
-import "./chunk-M6ZRRIBI.js";
+} from "./chunk-M3B3DE4K.js";
+import "./chunk-PJJ24GU7.js";
 import {
   OtlpExporter_exports,
-  TraceContext,
   externalTrace,
   pendingSpan,
   telemetryLayer,
   traceLinks
-} from "./chunk-ZCAMUXSG.js";
+} from "./chunk-ODEIDRGW.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-HDJH3RPR.js";
+} from "./chunk-57RKNWL2.js";
 import {
   HttpClientError_exports
-} from "./chunk-QKHR7BMF.js";
+} from "./chunk-UK573G7W.js";
 import {
   decoderOf
-} from "./chunk-2HHMABB6.js";
+} from "./chunk-5T57N25Q.js";
 import {
   StorageName
-} from "./chunk-FZJOYIZO.js";
+} from "./chunk-PZB6T6KU.js";
 import {
   JsonValue
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-27F7W2LG.js";
 import {
   Cause_exports,
   Clock_exports,
@@ -52,7 +51,7 @@ import {
   Semaphore_exports,
   Stream_exports,
   Tracer_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/contracts/live.ts
@@ -448,21 +447,6 @@ var observeBrowserPerformance = Effect_exports.gen(function* () {
   };
 });
 
-// ../telemetry/src/browser-operations.ts
-var BrowserOperationFailure = Schema_exports.Struct({
-  error_type: Schema_exports.Literals([
-    "BrowserDecodeFailed",
-    "BrowserTransportFailed",
-    "BrowserOperationFailed"
-  ]),
-  trace_id: TraceContext.fields.traceId,
-  span_id: TraceContext.fields.spanId,
-  page_id: Schema_exports.String
-});
-var ResponseTrace = Context_exports.Reference("telemetry/ResponseTrace", {
-  defaultValue: () => void 0
-});
-
 // ../telemetry/src/browser.ts
 var BrowserTelemetry = class extends Context_exports.Service()("executor/BrowserTelemetry") {
 };