effect-zero 0.4.0 → 0.4.2

package/dist/types/queries.d.ts

@@ -5,7 +5,7 @@ export declare const TransformRequestMessage: Schema.Tuple2<Schema.Literal<["tra
     args: Schema.Array$<typeof Schema.Unknown>;
 }>>>;
 export type TransformRequestMessage = typeof TransformRequestMessage.Type;
-export declare const TransformResponseMessage: Schema.Tuple2<Schema.Literal<["transformed"]>, Schema.Array$<Schema.Union<[Schema.Struct<{
+export declare const TransformResponseMessage: Schema.Union<[Schema.Tuple2<Schema.Literal<["transformed"]>, Schema.Array$<Schema.Union<[Schema.Struct<{
     id: typeof Schema.String;
     name: typeof Schema.String;
     ast: typeof Schema.Unknown;
@@ -13,17 +13,36 @@ export declare const TransformResponseMessage: Schema.Tuple2<Schema.Literal<["tr
     error: Schema.Literal<["app"]>;
     id: typeof Schema.String;
     name: typeof Schema.String;
-    details: typeof Schema.Unknown;
+    message: Schema.optional<typeof Schema.String>;
+    details: Schema.optional<typeof Schema.Unknown>;
 }>, Schema.Struct<{
-    error: Schema.Literal<["http"]>;
+    error: Schema.Literal<["parse"]>;
     id: typeof Schema.String;
     name: typeof Schema.String;
+    message: typeof Schema.String;
+    details: Schema.optional<typeof Schema.Unknown>;
+}>]>]>>>, Schema.Tuple2<Schema.Literal<["transformFailed"]>, Schema.Union<[Schema.Struct<{
+    origin: Schema.Literal<["server"]>;
+    reason: Schema.Literal<["database", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["http"]>;
     status: typeof Schema.Number;
-    details: typeof Schema.Unknown;
+    bodyPreview: Schema.optional<typeof Schema.String>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
 }>, Schema.Struct<{
-    error: Schema.Literal<["zero"]>;
-    id: typeof Schema.String;
-    name: typeof Schema.String;
-    details: typeof Schema.Unknown;
-}>]>]>>>;
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["timeout", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>]>>]>;
 //# sourceMappingURL=queries.d.ts.map

package/dist/types/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAiDxC,eAAO,MAAM,uBAAuB;;;;IAAkE,CAAC;AACvG,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC,IAAI,CAAC;AAK1E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;QAAqE,CAAC"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA6CxC,eAAO,MAAM,uBAAuB;;;;IAAkE,CAAC;AACvG,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC,IAAI,CAAC;AAS1E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAA2D,CAAC"}

package/dist/types/queries.js

@@ -1,7 +1,8 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { TransformFailedBody } from "./error.js";
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/9fe2b3cb770bad269ecaf12296c64a0739c23e4e/packages/zero-protocol/src/custom-queries.ts#L14
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/custom-queries.ts
 /** TODO: Defined as unknown for now */
 const Ast = Schema.Unknown;
 const TransformRequestBody = Schema.Array(Schema.Struct({
@@ -14,29 +15,27 @@ const TransformedQuery = Schema.Struct({
     name: Schema.String,
     ast: Ast,
 });
-const AppQueryError = Schema.Struct({
+const AppErroredQuery = Schema.Struct({
     error: Schema.Literal("app"),
     id: Schema.String,
     name: Schema.String,
-    details: JsonSchema,
+    // optional for backwards compatibility
+    message: Schema.optional(Schema.String),
+    details: Schema.optional(JsonSchema),
 });
-const ErrorSchema = Schema.Struct({
-    error: Schema.Literal("zero"),
+const ParseErroredQuery = Schema.Struct({
+    error: Schema.Literal("parse"),
     id: Schema.String,
     name: Schema.String,
-    details: JsonSchema,
+    message: Schema.String,
+    details: Schema.optional(JsonSchema),
 });
-const HttpQueryError = Schema.Struct({
-    error: Schema.Literal("http"),
-    id: Schema.String,
-    name: Schema.String,
-    status: Schema.Number,
-    details: JsonSchema,
-});
-const ErroredQuery = Schema.Union(AppQueryError, HttpQueryError, ErrorSchema);
+const ErroredQuery = Schema.Union(AppErroredQuery, ParseErroredQuery);
 const TransformResponseBody = Schema.Array(Schema.Union(TransformedQuery, ErroredQuery));
 export const TransformRequestMessage = Schema.Tuple(Schema.Literal("transform"), TransformRequestBody);
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const TransformErrorMessage = Schema.Tuple(Schema.Literal("transformError"), Schema.Array(ErroredQuery));
-export const TransformResponseMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+const TransformFailedMessage = Schema.Tuple(Schema.Literal("transformFailed"), TransformFailedBody);
+const TransformOkMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+export const TransformResponseMessage = Schema.Union(TransformOkMessage, TransformFailedMessage);
 //# sourceMappingURL=queries.js.map

package/dist/types/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,sDAAsD;AACtD,kIAAkI;AAElI,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;AAE3B,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CACvC,MAAM,CAAC,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;CAC/B,CAAC,CACH,CAAC;AAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,GAAG,EAAE,GAAG;CACT,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;AAE9E,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAGvG,iEAAiE;AACjE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,sDAAsD;AACtD,8HAA8H;AAE9H,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;AAE3B,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CACvC,MAAM,CAAC,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;CAC/B,CAAC,CACH,CAAC;AAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,GAAG,EAAE,GAAG;CACT,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,uCAAuC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;AAEtE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAGvG,iEAAiE;AACjE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEzG,MAAM,sBAAsB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAEpG,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect-zero",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "license": "MIT",
   "repository": {
     "url": "https://github.com/realms-labs/effect-zero"
@@ -19,7 +19,7 @@
     "@effect-atom/atom": "^0.4.3",
     "@effect/language-service": "^0.55.2",
     "@effect/vitest": "^0.27.0",
-    "@rocicorp/zero": "^0.26.1",
+    "@rocicorp/zero": "^1.3.0",
     "@types/bun": "latest",
     "@types/fs-extra": "^11.0.4",
     "effect": "^3.19.3",
@@ -34,16 +34,16 @@
     "@effect-atom/atom": "*"
   },
   "exports": {
-    "./server": {
+    "./client-transaction": {
       "import": {
-        "types": "./dist/server.d.ts",
-        "default": "./dist/server.js"
+        "types": "./dist/client-transaction.d.ts",
+        "default": "./dist/client-transaction.js"
       }
     },
-    "./query": {
+    "./server-transaction": {
       "import": {
-        "types": "./dist/query.d.ts",
-        "default": "./dist/query.js"
+        "types": "./dist/server-transaction.d.ts",
+        "default": "./dist/server-transaction.js"
       }
     },
     "./mutators": {
@@ -58,16 +58,16 @@
         "default": "./dist/snapshot.js"
       }
     },
-    "./client-transaction": {
+    "./query": {
       "import": {
-        "types": "./dist/client-transaction.d.ts",
-        "default": "./dist/client-transaction.js"
+        "types": "./dist/query.d.ts",
+        "default": "./dist/query.js"
       }
     },
-    "./server-transaction": {
+    "./server": {
       "import": {
-        "types": "./dist/server-transaction.d.ts",
-        "default": "./dist/server-transaction.js"
+        "types": "./dist/server.d.ts",
+        "default": "./dist/server.js"
       }
     },
     "./result": {
@@ -88,16 +88,22 @@
         "default": "./dist/types/push.js"
       }
     },
+    "./types/common": {
+      "import": {
+        "types": "./dist/types/common.d.ts",
+        "default": "./dist/types/common.js"
+      }
+    },
     "./types/queries": {
       "import": {
         "types": "./dist/types/queries.d.ts",
         "default": "./dist/types/queries.js"
       }
     },
-    "./types/common": {
+    "./types/error": {
       "import": {
-        "types": "./dist/types/common.d.ts",
-        "default": "./dist/types/common.js"
+        "types": "./dist/types/error.d.ts",
+        "default": "./dist/types/error.js"
       }
     }
   }

package/src/query.ts

@@ -91,11 +91,20 @@ export const stream = <T extends keyof S["tables"] & string, S extends ZeroSchem
     return Stream.asyncEffect<Parameters<Parameters<(typeof view)["addListener"]>[0]>>((emit) =>
       Effect.sync(() => view.addListener((...args) => emit.single(args))),
     ).pipe(
-      Stream.mapEffect(([data, resultType]) =>
+      Stream.mapEffect(([data, resultType, error]) =>
         Effect.sync(() => {
-          // logic here borrowed from: https://github.com/rocicorp/mono/blob/288b00ec94f5a9ae6e988513423af25c281dbb2a/packages/zero-react/src/use-query.tsx#L295
+          // logic here borrowed from: https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-react/src/use-query.tsx#L543
           const cloned = data === undefined ? data : (deepClone(data as ReadonlyJSONValue) as HumanReadable<R>);
-          return getSnapshot<R>(asQueryInternals(query).format.singular, cloned, resultType);
+          return getSnapshot<R>(
+            asQueryInternals(query).format.singular,
+            cloned,
+            resultType,
+            // TODO: Look into this. It seems like this is difficult but not impossible to model in the Effect paradigm.
+            // Likely need some kind of stateful piece between the publisher and and subscriber, allowing the subscriber to swap out
+            // the publisher when this function is called.
+            () => Effect.dieMessage("retry not available in `effect-zero`"),
+            error,
+          );
         }),
       ),
       Stream.map(QueryResult.make),

package/src/snapshot.ts

@@ -1,19 +1,22 @@
 // Code borrowed from:
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/zero-react/src/use-query.tsx
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/shared/src/deep-clone.ts#L4
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-react/src/use-query.tsx
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/shared/src/deep-clone.ts
 
-import type { HumanReadable, JSONValue, ReadonlyJSONValue } from "@rocicorp/zero";
+import type { ErroredQuery, HumanReadable, JSONValue, QueryErrorDetails, ReadonlyJSONValue, ResultType } from "@rocicorp/zero";
 import type { QueryResult } from "@rocicorp/zero/react";
 
 const emptyArray: unknown[] = [];
 
 const resultTypeUnknown = { type: "unknown" } as const;
 const resultTypeComplete = { type: "complete" } as const;
+const resultTypeError = {type: 'error'} as const;
 
 const emptySnapshotSingularUnknown = [undefined, resultTypeUnknown] as const;
 const emptySnapshotSingularComplete = [undefined, resultTypeComplete] as const;
+const emptySnapshotSingularErrorUnknown = [undefined, resultTypeError] as const;
 const emptySnapshotPluralUnknown = [emptyArray, resultTypeUnknown] as const;
 const emptySnapshotPluralComplete = [emptyArray, resultTypeComplete] as const;
+const emptySnapshotErrorUnknown = [emptyArray, resultTypeError] as const;
 
 export function getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TReturn> {
   return (singular ? emptySnapshotSingularUnknown : emptySnapshotPluralUnknown) as QueryResult<TReturn>;
@@ -26,21 +29,77 @@ export function getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TRet
 export function getSnapshot<TReturn>(
   singular: boolean,
   data: HumanReadable<TReturn>,
-  resultType: string,
+  resultType: ResultType,
+  retryFn: () => void,
+  error?: ErroredQuery,
 ): QueryResult<TReturn> {
   if (singular && data === undefined) {
-    return (resultType === "complete"
-      ? emptySnapshotSingularComplete
-      : emptySnapshotSingularUnknown) as unknown as QueryResult<TReturn>;
+    switch (resultType) {
+      case 'error':
+        if (error) {
+          return [
+            undefined,
+            makeError(retryFn, error),
+          ] as unknown as QueryResult<TReturn>;
+        }
+        return emptySnapshotSingularErrorUnknown as unknown as QueryResult<TReturn>;
+      case 'complete':
+        return emptySnapshotSingularComplete as unknown as QueryResult<TReturn>;
+      case 'unknown':
+        return emptySnapshotSingularUnknown as unknown as QueryResult<TReturn>;
+    }
   }
 
   if (!singular && (data as unknown[]).length === 0) {
-    return (
-      resultType === "complete" ? emptySnapshotPluralComplete : emptySnapshotPluralUnknown
-    ) as QueryResult<TReturn>;
+    switch (resultType) {
+      case 'error':
+        if (error) {
+          return [
+            emptyArray,
+            makeError(retryFn, error),
+          ] as unknown as QueryResult<TReturn>;
+        }
+        return emptySnapshotErrorUnknown as unknown as QueryResult<TReturn>;
+      case 'complete':
+        return emptySnapshotPluralComplete as unknown as QueryResult<TReturn>;
+      case 'unknown':
+        return emptySnapshotPluralUnknown as unknown as QueryResult<TReturn>;
+    }
   }
 
-  return [data, resultType === "complete" ? resultTypeComplete : resultTypeUnknown];
+  switch (resultType) {
+    case 'error':
+      if (error) {
+        return [data, makeError(retryFn, error)];
+      }
+      return [
+        data,
+        makeError(retryFn, {
+          error: 'app',
+          id: 'unknown',
+          name: 'unknown',
+          message: 'An unknown error occurred',
+        }),
+      ];
+    case 'complete':
+      return [data, resultTypeComplete];
+    case 'unknown':
+      return [data, resultTypeUnknown];
+  }
+}
+
+function makeError(retry: () => void, error: ErroredQuery): QueryErrorDetails {
+  const message = error.message ?? 'An unknown error occurred';
+  return {
+    type: 'error',
+    retry,
+    refetch: retry,
+    error: {
+      type: error.error,
+      message,
+      ...(error.details ? {details: error.details} : {}),
+    },
+  };
 }
 
 export function deepClone(value: ReadonlyJSONValue): JSONValue {

package/src/types/error.ts

@@ -0,0 +1,71 @@
+import * as Schema from "effect/Schema";
+import { JsonSchema } from "./common.js";
+
+// The code below was converted to Effect Schema from:
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/error.ts
+
+const MutationId = Schema.Struct({
+  id: Schema.Number,
+  clientID: Schema.String,
+});
+
+const PushFailedBase = Schema.Struct({
+  kind: Schema.Literal("PushFailed"),
+  details: Schema.optional(JsonSchema),
+  /**
+   * The mutationIDs of the mutations that failed to process.
+   * This can be a subset of the mutationIDs in the request.
+   */
+  mutationIDs: Schema.Array(MutationId),
+  message: Schema.String,
+});
+
+export const PushFailedBody = Schema.Union(
+  Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("server"),
+    reason: Schema.Literal("database", "parse", "oooMutation", "unsupportedPushVersion", "internal"),
+  }),
+  Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("http"),
+    status: Schema.Number,
+    bodyPreview: Schema.optional(Schema.String),
+  }),
+  Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("timeout", "parse", "internal"),
+  }),
+);
+
+const TransformFailedBase = Schema.Struct({
+  kind: Schema.Literal("TransformFailed"),
+  details: Schema.optional(JsonSchema),
+  /**
+   * The queryIDs of the queries that failed to transform.
+   */
+  queryIDs: Schema.Array(Schema.String),
+  message: Schema.String,
+});
+
+export const TransformFailedBody = Schema.Union(
+  Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("server"),
+    reason: Schema.Literal("database", "parse", "internal"),
+  }),
+  Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("http"),
+    status: Schema.Number,
+    bodyPreview: Schema.optional(Schema.String),
+  }),
+  Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("timeout", "parse", "internal"),
+  }),
+);

package/src/types/push.ts

@@ -1,8 +1,9 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { PushFailedBody } from "./error.js";
 
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/zero-protocol/src/push.ts
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/push.ts
 
 const PrimaryKey = Schema.Array(Schema.String);
 
@@ -15,6 +16,32 @@ const Row = Schema.Record({ key: Schema.String, value: Value });
 
 const CRUD_MUTATION_NAME = "_zero_crud";
 
+// biome-ignore lint/correctness/noUnusedVariables: borrowed code
+const CLEANUP_RESULTS_MUTATION_NAME = "_zero_cleanupResults";
+
+// biome-ignore lint/correctness/noUnusedVariables: borrowed code
+const CleanupResultsArg = Schema.Union(
+  // Legacy format (no type field) - treat as single
+  Schema.Struct({
+    clientGroupID: Schema.String,
+    clientID: Schema.String,
+    upToMutationID: Schema.Number,
+  }),
+  // Explicit single: delete up to a specific mutation ID for one client
+  Schema.Struct({
+    type: Schema.Literal("single"),
+    clientGroupID: Schema.String,
+    clientID: Schema.String,
+    upToMutationID: Schema.Number,
+  }),
+  // Bulk: delete all mutations for multiple clients
+  Schema.Struct({
+    type: Schema.Literal("bulk"),
+    clientGroupID: Schema.String,
+    clientIDs: Schema.NonEmptyArray(Schema.String),
+  }),
+);
+
 /**
  * Inserts if entity with id does not already exist.
  */
@@ -97,6 +124,11 @@ export const PushBody = Schema.Struct({
   schemaVersion: Schema.optional(Schema.Number),
   timestamp: Schema.Number,
   requestID: Schema.String,
+  /**
+   * @deprecated auth is managed at client-group scope via connect/updateAuth
+   * and should not be included in push messages.
+   */
+  auth: Schema.optional(Schema.String),
 });
 export type PushBody = typeof PushBody.Type;
 
@@ -111,13 +143,18 @@ const MutationId = Schema.Struct({
 export const AppError = Schema.Struct({
   error: Schema.Literal("app"),
   // The user can return any additional data here
+  message: Schema.optional(Schema.String),
   details: Schema.optional(JsonSchema),
 });
 
 export type AppError = typeof AppError.Type;
 
 export const ZeroError = Schema.Struct({
-  error: Schema.Union(Schema.Literal("oooMutation"), Schema.Literal("alreadyProcessed")),
+  error: Schema.Union(
+    /** @deprecated push oooMutation errors are now represented as ['error', { ... }] messages */
+    Schema.Literal("oooMutation"),
+    Schema.Literal("alreadyProcessed"),
+  ),
   details: Schema.optional(JsonSchema),
 });
 
@@ -147,42 +184,64 @@ const PushOk = Schema.Struct({
   mutations: Schema.Array(MutationResponse),
 });
 
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const UnsupportedPushVersion = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("unsupportedPushVersion"),
-  // optional for backwards compatibility
-  // This field is included so the client knows which mutations
-  // were not processed by the server.
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const UnsupportedSchemaVersion = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("unsupportedSchemaVersion"),
-  // optional for backwards compatibility
-  // This field is included so the client knows which mutations
-  // were not processed by the server.
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push http errors are now represented as ['error', { ... }] messages
+ */
 const HttpError = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("http"),
+  /** @deprecated */
   status: Schema.Number,
+  /** @deprecated */
   details: Schema.String,
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push zero errors are now represented as ['error', { ... }] messages
+ */
 const ZeroPusherError = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("zeroPusher"),
+  /** @deprecated */
   details: Schema.String,
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const PushError = Schema.Union(UnsupportedPushVersion, UnsupportedSchemaVersion, HttpError, ZeroPusherError);
 
-export const PushResponse = Schema.Union(PushOk, PushError);
+const PushResponseBody = Schema.Union(PushOk, PushError);
+
+export const PushResponse = Schema.Union(PushResponseBody, PushFailedBody);
 export type PushResponse = typeof PushResponse.Type;
 
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
-const PushResponseMessage = Schema.Tuple(Schema.Literal("pushResponse"), PushResponse);
+const PushResponseMessage = Schema.Tuple(Schema.Literal("pushResponse"), PushResponseBody);
 
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const AckMutationResponsesMessage = Schema.Tuple(Schema.Literal("ackMutationResponses"), MutationId);

package/src/types/queries.ts

@@ -1,8 +1,9 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { TransformFailedBody } from "./error.js";
 
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/9fe2b3cb770bad269ecaf12296c64a0739c23e4e/packages/zero-protocol/src/custom-queries.ts#L14
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/custom-queries.ts
 
 /** TODO: Defined as unknown for now */
 const Ast = Schema.Unknown;
@@ -21,29 +22,24 @@ const TransformedQuery = Schema.Struct({
   ast: Ast,
 });
 
-const AppQueryError = Schema.Struct({
+const AppErroredQuery = Schema.Struct({
   error: Schema.Literal("app"),
   id: Schema.String,
   name: Schema.String,
-  details: JsonSchema,
+  // optional for backwards compatibility
+  message: Schema.optional(Schema.String),
+  details: Schema.optional(JsonSchema),
 });
 
-const ErrorSchema = Schema.Struct({
-  error: Schema.Literal("zero"),
+const ParseErroredQuery = Schema.Struct({
+  error: Schema.Literal("parse"),
   id: Schema.String,
   name: Schema.String,
-  details: JsonSchema,
+  message: Schema.String,
+  details: Schema.optional(JsonSchema),
 });
 
-const HttpQueryError = Schema.Struct({
-  error: Schema.Literal("http"),
-  id: Schema.String,
-  name: Schema.String,
-  status: Schema.Number,
-  details: JsonSchema,
-});
-
-const ErroredQuery = Schema.Union(AppQueryError, HttpQueryError, ErrorSchema);
+const ErroredQuery = Schema.Union(AppErroredQuery, ParseErroredQuery);
 
 const TransformResponseBody = Schema.Array(Schema.Union(TransformedQuery, ErroredQuery));
 
@@ -53,4 +49,8 @@ export type TransformRequestMessage = typeof TransformRequestMessage.Type;
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const TransformErrorMessage = Schema.Tuple(Schema.Literal("transformError"), Schema.Array(ErroredQuery));
 
-export const TransformResponseMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+const TransformFailedMessage = Schema.Tuple(Schema.Literal("transformFailed"), TransformFailedBody);
+
+const TransformOkMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+
+export const TransformResponseMessage = Schema.Union(TransformOkMessage, TransformFailedMessage);