@syncular/tauri 0.30.16 → 0.32.0

package/README.md

@@ -9,7 +9,7 @@ bun add @syncular/tauri @tauri-apps/api
 ```
 
 The bridge works with any frontend framework. Generate the schema module using
-the [existing-project setup](https://syncular.dev/guide-schema/#add-syncular-to-an-existing-project),
+the [existing-project setup](https://syncular.dev/add-to-existing-app/),
 then create one shared client in the webview:
 
 ```ts
@@ -307,7 +307,7 @@ The snapshot API revision removes the individual `schemaFloor`, `leaseState`,
 `upgrading`, and `syncNeeded` methods. Read those fields from
 `await client.statusSnapshot()`. Collection and outcome reads remain methods.
 React accepts the bridge directly. See the
-[client migration](https://syncular.dev/platform-web/#snapshot-api-migration).
+[client migration](https://syncular.dev/platform-web-reads-writes/#reading-local-state).
 
 
 ## Atomic sparse writes and retained conflicts

package/dist/index.d.ts

@@ -28,12 +28,20 @@ import type { ClientSnapshotMethods, PromiseMethods } from '@syncular/client';
  * `invoke`/`listen` either from its ESM entry points, from the ambient
  * `window.__TAURI__`, or via injected doubles (tests).
  */
-import type { AuthorityReadPolicy, ClientChangeListener, ClientDiagnosticsListener, ClientDiagnosticsRequest, ClientDiagnosticsSnapshot, CommitOutcome, CommitOutcomeQuery, ConflictRecord, EncryptionKeyringConfig, InvalidationListener, LocalDataPurgeInput, LocalDataPurgeResult, LocalDataRebootstrapInput, LocalDataRebootstrapResult, MutationInput, PresencePeer, PreviousVersionAudit, PreviousVersionReadSpec, PreviousVersionSnapshot, QueryReadSpec, QuerySnapshot, RejectionRecord, ResolveCommitOutcomeInput, SecurityLifecycle, SqlRow, SqlValue, SyncClientConfig, SyncStatusSnapshot, WindowBase, WindowState } from '@syncular/client';
+import type { AuthorityReadPolicy, ClientChangeListener, ClientDiagnosticsListener, ClientDiagnosticsRequest, ClientDiagnosticsSnapshot, CommitOutcome, CommitOutcomeQuery, ConflictRecord, EncryptionKeyringConfig, InvalidationListener, LocalDataPurgeInput, LocalDataPurgeResult, LocalDataRebootstrapInput, LocalDataRebootstrapResult, MutationInput, PresencePeer, PreviousVersionAudit, PreviousVersionReadSpec, PreviousVersionSnapshot, QueryReadSpec, QuerySnapshot, RejectionRecord, ResolveCommitOutcomeInput, SecurityLifecycle, SnapshotRead, SnapshotReadRequest, SqlRow, SqlValue, SyncClientConfig, SyncStatusSnapshot, WindowBase, WindowState } from '@syncular/client';
 /** One event pushed on `syncular://event` (the derived client-observable set). */
 interface SyncularEvent {
     readonly type: string;
     readonly [key: string]: unknown;
 }
+/** §7.5: one read-only statement in an atomic sidecar snapshot read. */
+export type { SnapshotStatement } from '@syncular/client';
+/** §7.5: the catch-up state of one subscription from the sidecar. */
+export type { SubscriptionCatchup } from '@syncular/client';
+/** §7.5: delivery status for one client commit id. */
+export type { CommitDelivery } from '@syncular/client';
+/** §7.5: one atomic sidecar snapshot read result with decoded rows. */
+export type SnapshotReadResult = SnapshotRead;
 /** The two Tauri primitives the bridge needs — injectable for tests. */
 export interface TauriApi {
     invoke<T>(cmd: string, args?: Record<string, unknown>): Promise<T>;
@@ -136,6 +144,12 @@ export declare class TauriSyncClient implements PromiseMethods<ClientSnapshotMet
     query(sql: string, params?: readonly SqlValue[]): Promise<SqlRow[]>;
     querySnapshot<Row = SqlRow>(spec: QueryReadSpec): Promise<QuerySnapshot<Row>>;
     localRevision(): Promise<bigint>;
+    /**
+     * §7.5: one atomic read over the file-backed sidecar. Every statement and
+     * every catch-up/delivery read shares one revision (a `bigint`, matching
+     * `querySnapshot`) and one read transaction; every query row is decoded.
+     */
+    snapshotRead(request: SnapshotReadRequest): Promise<SnapshotRead>;
     statusSnapshot(): Promise<SyncStatusSnapshot>;
     diagnosticsSnapshot(request?: ClientDiagnosticsRequest): Promise<ClientDiagnosticsSnapshot>;
     mutate(mutations: readonly MutationInput[]): Promise<string>;
@@ -200,7 +214,8 @@ export declare class TauriSyncClient implements PromiseMethods<ClientSnapshotMet
 export declare class TauriSyncError extends Error {
     readonly code: string;
     readonly details: Readonly<Record<string, unknown>> | undefined;
-    constructor(code: string, message: string, details?: Readonly<Record<string, unknown>>);
+    readonly retryable: boolean;
+    constructor(code: string, message: string, details?: Readonly<Record<string, unknown>>, retryable?: boolean);
 }
 /**
  * Construct the bridge and issue the native `create` (opening/attaching the
@@ -211,4 +226,3 @@ export declare class TauriSyncError extends Error {
 export declare function createTauriSyncClient(config: TauriSyncClientConfig): Promise<TauriSyncClient>;
 /** @internal Explicit bridge extension used by the authority entry. */
 export declare function createTauriSyncClient<Client extends TauriSyncClient>(config: TauriSyncClientConfig, createClient: (...args: ConstructorParameters<typeof TauriSyncClient>) => Client): Promise<Client>;
-export {};

package/dist/index.js

@@ -7,9 +7,23 @@ import { decodeLocalDataRebootstrapResult, decodePreviousVersionAuditResult, dec
 export const SYNCULAR_EVENT = 'syncular://event';
 const PLUGIN = 'plugin:syncular|';
 function isBytesEnvelope(value) {
-    return (typeof value === 'object' &&
-        value !== null &&
-        typeof value.$bytes === 'string');
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const record = value;
+    return (Object.keys(record).length === 1 &&
+        typeof record.$bytes === 'string' &&
+        /^(?:[0-9a-fA-F]{2})*$/.test(record.$bytes));
+}
+/**
+ * §7.1: a host reply that carries an envelope-shaped object with a malformed
+ * body is refused, never padded into different bytes. Objects without a
+ * `$bytes` key keep the defensive JSON text round-trip below.
+ */
+function assertBytesEnvelope(value) {
+    if (typeof value !== 'object' || value === null || !('$bytes' in value))
+        return;
+    if (!isBytesEnvelope(value))
+        throw new TauriSyncError('sync.invalid_request', 'a $bytes envelope requires exactly one $bytes key holding an even-length hexadecimal string');
 }
 function isBigIntEnvelope(value) {
     return (typeof value === 'object' &&
@@ -24,10 +38,11 @@ function bytesToHex(bytes) {
     return out;
 }
 function hexToBytes(hex) {
-    const clean = hex.length % 2 === 0 ? hex : `0${hex}`;
-    const out = new Uint8Array(clean.length / 2);
+    if (!/^(?:[0-9a-fA-F]{2})*$/.test(hex))
+        throw new TauriSyncError('sync.invalid_request', 'a $bytes envelope requires an even-length hexadecimal string');
+    const out = new Uint8Array(hex.length / 2);
     for (let i = 0; i < out.length; i++) {
-        out[i] = Number.parseInt(clean.slice(i * 2, i * 2 + 2), 16);
+        out[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
     }
     return out;
 }
@@ -68,6 +83,7 @@ function encodeEncryption(config) {
 }
 /** Decode one query-result cell back to an `SqlValue` (`{$bytes}` → bytes). */
 function decodeCell(value) {
+    assertBytesEnvelope(value);
     if (isBytesEnvelope(value))
         return hexToBytes(value.$bytes);
     if (isBigIntEnvelope(value))
@@ -82,6 +98,63 @@ function decodeCell(value) {
     // string (SQLite json columns arrive as text already; this is defensive).
     return JSON.stringify(value);
 }
+/** Decode one native outcome row image. Only the `{$bytes}` envelope is
+ * honored; operation `values` stay `JsonRowValue` and are not passed here. */
+function decodeOutcomeRow(row) {
+    const out = {};
+    for (const [key, value] of Object.entries(row)) {
+        // Reserved `_sync_*` columns stay engine-internal, matching `decodeRow`.
+        if (key.startsWith('_sync_'))
+            continue;
+        assertBytesEnvelope(value);
+        if (value === null ||
+            typeof value === 'string' ||
+            typeof value === 'number' ||
+            typeof value === 'boolean') {
+            out[key] = value;
+        }
+        else if (isBytesEnvelope(value)) {
+            out[key] = hexToBytes(value.$bytes);
+        }
+        else {
+            out[key] = JSON.stringify(value);
+        }
+    }
+    return out;
+}
+/** Decode the row images a native `CommitOutcome` carries: conflict server
+ * rows and retained-row images. */
+function decodeCommitOutcome(outcome) {
+    return {
+        ...outcome,
+        results: outcome.results.map((result) => result.status === 'conflict'
+            ? {
+                ...result,
+                conflict: {
+                    ...result.conflict,
+                    serverRow: decodeOutcomeRow(result.conflict.serverRow),
+                },
+            }
+            : result),
+        ...(outcome.retainedRows !== undefined
+            ? {
+                retainedRows: outcome.retainedRows.map((row) => ({
+                    ...row,
+                    localRow: row.localRow === null ? null : decodeOutcomeRow(row.localRow),
+                    serverRow: row.serverRow === null ? null : decodeOutcomeRow(row.serverRow),
+                    ...(row.uniqueConflicts !== undefined
+                        ? {
+                            uniqueConflicts: row.uniqueConflicts.map((conflict) => ({
+                                ...conflict,
+                                serverRow: decodeOutcomeRow(conflict.serverRow),
+                            })),
+                        }
+                        : {}),
+                })),
+            }
+            : {}),
+    };
+}
 /** @internal Shared native row codec. */
 export function decodeRow(row) {
     const out = {};
@@ -179,7 +252,7 @@ export class TauriSyncClient {
         }
         const reply = await this.#tauri.invoke(`${PLUGIN}syncular_command`, { command: { method, params } });
         if (reply.error !== undefined) {
-            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined);
+            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined, reply.error.retryable ?? false);
         }
         return reply.result;
     }
@@ -369,7 +442,7 @@ export class TauriSyncClient {
         this.#requireActive();
         const reply = await this.#tauri.invoke(`${PLUGIN}syncular_query`, { sql, params: (params ?? []).map(encodeParam) });
         if (reply.error !== undefined) {
-            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined);
+            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined, reply.error.retryable ?? false);
         }
         const rows = reply.result.rows ?? [];
         return rows.map((r) => decodeRow(r));
@@ -383,7 +456,7 @@ export class TauriSyncClient {
             ...(spec.owner !== undefined ? { owner: spec.owner } : {}),
         });
         if (reply.error !== undefined) {
-            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined);
+            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined, reply.error.retryable ?? false);
         }
         const result = reply.result;
         return {
@@ -396,6 +469,37 @@ export class TauriSyncClient {
         const result = (await this.#command('localRevision', {}));
         return BigInt(result.revision);
     }
+    /**
+     * §7.5: one atomic read over the file-backed sidecar. Every statement and
+     * every catch-up/delivery read shares one revision (a `bigint`, matching
+     * `querySnapshot`) and one read transaction; every query row is decoded.
+     */
+    async snapshotRead(request) {
+        this.#requireActive();
+        const reply = await this.#tauri.invoke(`${PLUGIN}syncular_snapshot_read`, {
+            statements: request.statements.map((statement) => ({
+                sql: statement.sql,
+                params: (statement.params ?? []).map(encodeParam),
+            })),
+            coverage: request.coverage ?? [],
+            subscriptions: request.subscriptions ?? [],
+            commitIds: request.commitIds ?? [],
+            ...(request.owner !== undefined ? { owner: request.owner } : {}),
+        });
+        if (reply.error !== undefined) {
+            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined, reply.error.retryable ?? false);
+        }
+        const result = reply.result;
+        return {
+            revision: BigInt(result.revision),
+            queries: result.queries.map((rows) => rows.map(decodeRow)),
+            coverage: result.coverage,
+            subscriptions: result.subscriptions,
+            deliveries: result.deliveries.map((delivery) => delivery.status === 'known'
+                ? { ...delivery, outcome: decodeCommitOutcome(delivery.outcome) }
+                : delivery),
+        };
+    }
     async statusSnapshot() {
         return (await this.#command('statusSnapshot', {}));
     }
@@ -461,7 +565,7 @@ export class TauriSyncClient {
         this.#requireActive();
         const reply = await this.#tauri.invoke(`${PLUGIN}syncular_set_headers`, { headers });
         if (reply.error !== undefined) {
-            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined);
+            throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined, reply.error.retryable ?? false);
         }
     }
     // -- Native CRDT (SPEC.md §5.10.5; needs the plugin `crdt-yjs` feature) ------
@@ -555,17 +659,19 @@ export class TauriSyncClient {
         const result = (await this.#command('commitOutcome', {
             clientCommitId,
         }));
-        return result.outcome;
+        return result.outcome === undefined
+            ? undefined
+            : decodeCommitOutcome(result.outcome);
     }
     async commitOutcomes(query = {}) {
         const result = (await this.#command('commitOutcomes', { query }));
-        return result.outcomes;
+        return result.outcomes.map(decodeCommitOutcome);
     }
     async resolveCommitOutcome(input) {
         const result = (await this.#command('resolveCommitOutcome', {
             input,
         }));
-        return result.outcome;
+        return decodeCommitOutcome(result.outcome);
     }
     async pendingCommits() {
         const result = (await this.#command('pendingCommitIds', {}));
@@ -620,11 +726,13 @@ function decodeDiagnosticsSnapshot(value, kind) {
 export class TauriSyncError extends Error {
     code;
     details;
-    constructor(code, message, details) {
+    retryable;
+    constructor(code, message, details, retryable = false) {
         super(message);
         this.name = 'TauriSyncError';
         this.code = code;
         this.details = details;
+        this.retryable = retryable;
     }
 }
 function toStringSet(value) {
@@ -762,7 +870,7 @@ export async function createTauriSyncClient(config, createClient = (...args) =>
     });
     if (reply.error !== undefined) {
         unlisten();
-        throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined);
+        throw new TauriSyncError(reply.error.code, reply.error.message, reply.error.details ?? undefined, reply.error.retryable ?? false);
     }
     return client;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/tauri",
-  "version": "0.30.16",
+  "version": "0.32.0",
   "description": "Tauri integration for the Syncular client",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -56,13 +56,13 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@syncular/client": "0.30.16"
+    "@syncular/client": "0.32.0"
   },
   "peerDependencies": {
     "@tauri-apps/api": ">=2.0.0"
   },
   "devDependencies": {
-    "@syncular/react": "0.30.16",
-    "@syncular/server": "0.30.16"
+    "@syncular/react": "0.32.0",
+    "@syncular/server": "0.32.0"
   }
 }

package/src/index.ts

@@ -60,6 +60,8 @@ import type {
   RejectionRecord,
   ResolveCommitOutcomeInput,
   SecurityLifecycle,
+  SnapshotRead,
+  SnapshotReadRequest,
   SqlRow,
   SqlValue,
   SyncClientConfig,
@@ -86,6 +88,7 @@ interface CommandReply {
     readonly code: string;
     readonly message: string;
     readonly details?: Readonly<Record<string, unknown>> | null;
+    readonly retryable?: boolean;
   };
 }
 
@@ -95,6 +98,18 @@ interface SyncularEvent {
   readonly [key: string]: unknown;
 }
 
+/** §7.5: one read-only statement in an atomic sidecar snapshot read. */
+export type { SnapshotStatement } from '@syncular/client';
+
+/** §7.5: the catch-up state of one subscription from the sidecar. */
+export type { SubscriptionCatchup } from '@syncular/client';
+
+/** §7.5: delivery status for one client commit id. */
+export type { CommitDelivery } from '@syncular/client';
+
+/** §7.5: one atomic sidecar snapshot read result with decoded rows. */
+export type SnapshotReadResult = SnapshotRead;
+
 /** The two Tauri primitives the bridge needs — injectable for tests. */
 export interface TauriApi {
   invoke<T>(cmd: string, args?: Record<string, unknown>): Promise<T>;
@@ -165,13 +180,30 @@ export type BytesEnvelope = { readonly $bytes: string };
 type BigIntEnvelope = { readonly $bigint: string };
 
 function isBytesEnvelope(value: unknown): value is BytesEnvelope {
+  if (typeof value !== 'object' || value === null) return false;
+  const record = value as Record<string, unknown>;
   return (
-    typeof value === 'object' &&
-    value !== null &&
-    typeof (value as { $bytes?: unknown }).$bytes === 'string'
+    Object.keys(record).length === 1 &&
+    typeof record.$bytes === 'string' &&
+    /^(?:[0-9a-fA-F]{2})*$/.test(record.$bytes)
   );
 }
 
+/**
+ * §7.1: a host reply that carries an envelope-shaped object with a malformed
+ * body is refused, never padded into different bytes. Objects without a
+ * `$bytes` key keep the defensive JSON text round-trip below.
+ */
+function assertBytesEnvelope(value: unknown): void {
+  if (typeof value !== 'object' || value === null || !('$bytes' in value))
+    return;
+  if (!isBytesEnvelope(value))
+    throw new TauriSyncError(
+      'sync.invalid_request',
+      'a $bytes envelope requires exactly one $bytes key holding an even-length hexadecimal string',
+    );
+}
+
 function isBigIntEnvelope(value: unknown): value is BigIntEnvelope {
   return (
     typeof value === 'object' &&
@@ -189,10 +221,14 @@ function bytesToHex(bytes: Uint8Array): string {
 }
 
 function hexToBytes(hex: string): Uint8Array {
-  const clean = hex.length % 2 === 0 ? hex : `0${hex}`;
-  const out = new Uint8Array(clean.length / 2);
+  if (!/^(?:[0-9a-fA-F]{2})*$/.test(hex))
+    throw new TauriSyncError(
+      'sync.invalid_request',
+      'a $bytes envelope requires an even-length hexadecimal string',
+    );
+  const out = new Uint8Array(hex.length / 2);
   for (let i = 0; i < out.length; i++) {
-    out[i] = Number.parseInt(clean.slice(i * 2, i * 2 + 2), 16);
+    out[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
   }
   return out;
 }
@@ -234,6 +270,7 @@ function encodeEncryption(config: EncryptionKeyringConfig): unknown {
 
 /** Decode one query-result cell back to an `SqlValue` (`{$bytes}` → bytes). */
 function decodeCell(value: unknown): SqlValue {
+  assertBytesEnvelope(value);
   if (isBytesEnvelope(value)) return hexToBytes(value.$bytes);
   if (isBigIntEnvelope(value)) return BigInt(value.$bigint);
   if (
@@ -249,6 +286,74 @@ function decodeCell(value: unknown): SqlValue {
   return JSON.stringify(value);
 }
 
+/** A decoded outcome row cell. Structurally the shared `RowValue` (bytes are
+ * `Uint8Array`); native outcome rows emit plain JSON numbers, never `$bigint`. */
+type OutcomeRowValue = ConflictRecord['serverRow'][string];
+
+/** Decode one native outcome row image. Only the `{$bytes}` envelope is
+ * honored; operation `values` stay `JsonRowValue` and are not passed here. */
+function decodeOutcomeRow(
+  row: Readonly<Record<string, unknown>>,
+): Record<string, OutcomeRowValue> {
+  const out: Record<string, OutcomeRowValue> = {};
+  for (const [key, value] of Object.entries(row)) {
+    // Reserved `_sync_*` columns stay engine-internal, matching `decodeRow`.
+    if (key.startsWith('_sync_')) continue;
+    assertBytesEnvelope(value);
+    if (
+      value === null ||
+      typeof value === 'string' ||
+      typeof value === 'number' ||
+      typeof value === 'boolean'
+    ) {
+      out[key] = value;
+    } else if (isBytesEnvelope(value)) {
+      out[key] = hexToBytes(value.$bytes);
+    } else {
+      out[key] = JSON.stringify(value);
+    }
+  }
+  return out;
+}
+
+/** Decode the row images a native `CommitOutcome` carries: conflict server
+ * rows and retained-row images. */
+function decodeCommitOutcome(outcome: CommitOutcome): CommitOutcome {
+  return {
+    ...outcome,
+    results: outcome.results.map((result) =>
+      result.status === 'conflict'
+        ? {
+            ...result,
+            conflict: {
+              ...result.conflict,
+              serverRow: decodeOutcomeRow(result.conflict.serverRow),
+            },
+          }
+        : result,
+    ),
+    ...(outcome.retainedRows !== undefined
+      ? {
+          retainedRows: outcome.retainedRows.map((row) => ({
+            ...row,
+            localRow:
+              row.localRow === null ? null : decodeOutcomeRow(row.localRow),
+            serverRow:
+              row.serverRow === null ? null : decodeOutcomeRow(row.serverRow),
+            ...(row.uniqueConflicts !== undefined
+              ? {
+                  uniqueConflicts: row.uniqueConflicts.map((conflict) => ({
+                    ...conflict,
+                    serverRow: decodeOutcomeRow(conflict.serverRow),
+                  })),
+                }
+              : {}),
+          })),
+        }
+      : {}),
+  };
+}
+
 /** @internal Shared native row codec. */
 export function decodeRow(row: Record<string, unknown>): SqlRow {
   const out: SqlRow = {};
@@ -373,6 +478,7 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
         reply.error.code,
         reply.error.message,
         reply.error.details ?? undefined,
+        reply.error.retryable ?? false,
       );
     }
     return reply.result;
@@ -600,6 +706,7 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
         reply.error.code,
         reply.error.message,
         reply.error.details ?? undefined,
+        reply.error.retryable ?? false,
       );
     }
     const rows = (reply.result as { rows?: unknown[] }).rows ?? [];
@@ -624,6 +731,7 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
         reply.error.code,
         reply.error.message,
         reply.error.details ?? undefined,
+        reply.error.retryable ?? false,
       );
     }
     const result = reply.result as {
@@ -645,6 +753,54 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
     return BigInt(result.revision);
   }
 
+  /**
+   * §7.5: one atomic read over the file-backed sidecar. Every statement and
+   * every catch-up/delivery read shares one revision (a `bigint`, matching
+   * `querySnapshot`) and one read transaction; every query row is decoded.
+   */
+  async snapshotRead(request: SnapshotReadRequest): Promise<SnapshotRead> {
+    this.#requireActive();
+    const reply = await this.#tauri.invoke<CommandReply>(
+      `${PLUGIN}syncular_snapshot_read`,
+      {
+        statements: request.statements.map((statement) => ({
+          sql: statement.sql,
+          params: (statement.params ?? []).map(encodeParam),
+        })),
+        coverage: request.coverage ?? [],
+        subscriptions: request.subscriptions ?? [],
+        commitIds: request.commitIds ?? [],
+        ...(request.owner !== undefined ? { owner: request.owner } : {}),
+      },
+    );
+    if (reply.error !== undefined) {
+      throw new TauriSyncError(
+        reply.error.code,
+        reply.error.message,
+        reply.error.details ?? undefined,
+        reply.error.retryable ?? false,
+      );
+    }
+    const result = reply.result as {
+      revision: string;
+      queries: readonly (readonly Record<string, unknown>[])[];
+      coverage: SnapshotRead['coverage'];
+      subscriptions: SnapshotRead['subscriptions'];
+      deliveries: SnapshotRead['deliveries'];
+    };
+    return {
+      revision: BigInt(result.revision),
+      queries: result.queries.map((rows) => rows.map(decodeRow)),
+      coverage: result.coverage,
+      subscriptions: result.subscriptions,
+      deliveries: result.deliveries.map((delivery) =>
+        delivery.status === 'known'
+          ? { ...delivery, outcome: decodeCommitOutcome(delivery.outcome) }
+          : delivery,
+      ),
+    };
+  }
+
   async statusSnapshot(): Promise<SyncStatusSnapshot> {
     return (await this.#command('statusSnapshot', {})) as SyncStatusSnapshot;
   }
@@ -754,6 +910,7 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
         reply.error.code,
         reply.error.message,
         reply.error.details ?? undefined,
+        reply.error.retryable ?? false,
       );
     }
   }
@@ -897,7 +1054,9 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
     const result = (await this.#command('commitOutcome', {
       clientCommitId,
     })) as { outcome?: CommitOutcome };
-    return result.outcome;
+    return result.outcome === undefined
+      ? undefined
+      : decodeCommitOutcome(result.outcome);
   }
 
   async commitOutcomes(
@@ -906,7 +1065,7 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
     const result = (await this.#command('commitOutcomes', { query })) as {
       outcomes: CommitOutcome[];
     };
-    return result.outcomes;
+    return result.outcomes.map(decodeCommitOutcome);
   }
 
   async resolveCommitOutcome(
@@ -915,7 +1074,7 @@ export class TauriSyncClient implements PromiseMethods<ClientSnapshotMethods> {
     const result = (await this.#command('resolveCommitOutcome', {
       input,
     })) as { outcome: CommitOutcome };
-    return result.outcome;
+    return decodeCommitOutcome(result.outcome);
   }
 
   async pendingCommits(): Promise<unknown[]> {
@@ -984,15 +1143,18 @@ function decodeDiagnosticsSnapshot(
 export class TauriSyncError extends Error {
   readonly code: string;
   readonly details: Readonly<Record<string, unknown>> | undefined;
+  readonly retryable: boolean;
   constructor(
     code: string,
     message: string,
     details?: Readonly<Record<string, unknown>>,
+    retryable = false,
   ) {
     super(message);
     this.name = 'TauriSyncError';
     this.code = code;
     this.details = details;
+    this.retryable = retryable;
   }
 }
 
@@ -1168,6 +1330,7 @@ export async function createTauriSyncClient(
       reply.error.code,
       reply.error.message,
       reply.error.details ?? undefined,
+      reply.error.retryable ?? false,
     );
   }