jazz-tools 0.19.7 → 0.19.10

package/dist/tools/subscribe/SubscriptionCache.d.ts

@@ -0,0 +1,51 @@
+import { LocalNode } from "cojson";
+import type { CoValue, CoValueClassOrSchema, ResolveQuery } from "../internal.js";
+import { SubscriptionScope } from "./SubscriptionScope.js";
+import type { BranchDefinition } from "./types.js";
+export declare class SubscriptionCache {
+    private cache;
+    private cleanupTimeout;
+    constructor(cleanupTimeout?: number);
+    /**
+     * Get the inner set for a given id (read-only access)
+     */
+    private getIdSet;
+    /**
+     * Get the inner set for a given id, creating it if it doesn't exist
+     */
+    private getIdSetOrCreate;
+    /**
+     * Check if an entry matches the provided parameters
+     */
+    private matchesEntry;
+    /**
+     * Find a matching cache entry by comparing against entry properties
+     * Uses id-based nesting to quickly filter candidates
+     */
+    private findMatchingEntry;
+    /**
+     * Handle subscriber count changes from SubscriptionScope
+     */
+    private handleSubscriberChange;
+    /**
+     * Schedule cleanup timeout for an entry
+     */
+    private scheduleCleanup;
+    /**
+     * Cancel pending cleanup timeout for an entry
+     */
+    private cancelCleanup;
+    /**
+     * Destroy a cache entry and its SubscriptionScope
+     */
+    private destroyEntry;
+    /**
+     * Get or create a SubscriptionScope from the cache
+     */
+    getOrCreate<S extends CoValueClassOrSchema>(node: LocalNode, schema: S, id: string, resolve: ResolveQuery<S>, skipRetry?: boolean, bestEffortResolution?: boolean, branch?: BranchDefinition): SubscriptionScope<CoValue>;
+    /**
+     * Clear all cache entries and destroy all SubscriptionScope instances
+     */
+    clear(): void;
+}
+//# sourceMappingURL=SubscriptionCache.d.ts.map

package/dist/tools/subscribe/SubscriptionCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubscriptionCache.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EACV,OAAO,EACP,oBAAoB,EAGpB,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAanD,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,cAAc,CAAS;gBAEnB,cAAc,GAAE,MAAa;IAKzC;;OAEG;IACH,OAAO,CAAC,QAAQ;IAIhB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACH,OAAO,CAAC,YAAY;IA+BpB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAsBzB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,eAAe;IASvB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,YAAY;IA2BpB;;OAEG;IACH,WAAW,CAAC,CAAC,SAAS,oBAAoB,EACxC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EACxB,SAAS,CAAC,EAAE,OAAO,EACnB,oBAAoB,CAAC,EAAE,OAAO,EAC9B,MAAM,CAAC,EAAE,gBAAgB,GACxB,iBAAiB,CAAC,OAAO,CAAC;IA6D7B;;OAEG;IACH,KAAK,IAAI,IAAI;CAiBd"}

package/dist/tools/subscribe/SubscriptionScope.d.ts

@@ -1,9 +1,10 @@
-import type { LocalNode, RawCoValue } from "cojson";
+import { LocalNode, RawCoValue } from "cojson";
 import { CoList, CoMap, type CoValue, type ID, MaybeLoaded, NotLoaded, type RefEncoded, type RefsToResolve } from "../internal.js";
 import { CoValueCoreSubscription } from "./CoValueCoreSubscription.js";
 import { JazzError } from "./JazzError.js";
 import type { BranchDefinition, SubscriptionValue, SubscriptionValueLoading } from "./types.js";
 import { CoValueLoadingState, NotLoadedCoValueState } from "./types.js";
+import { PromiseWithStatus } from "./utils.js";
 export declare class SubscriptionScope<D extends CoValue> {
     node: LocalNode;
     id: ID<D>;
@@ -38,18 +39,42 @@ export declare class SubscriptionScope<D extends CoValue> {
     migrating: boolean;
     closed: boolean;
     silenceUpdates: boolean;
-    constructor(node: LocalNode, resolve: RefsToResolve<D>, id: ID<D>, schema: RefEncoded<D>, skipRetry?: boolean, bestEffortResolution?: boolean, unstable_branch?: BranchDefinition | undefined);
+    /**
+     * Stack trace captured at subscription creation time.
+     * This helps identify which component/hook created the subscription
+     * when debugging "value unavailable" errors.
+     */
+    callerStack: Error | undefined;
+    constructor(node: LocalNode, resolve: RefsToResolve<D>, id: ID<D>, schema: RefEncoded<D>, skipRetry?: boolean, bestEffortResolution?: boolean, unstable_branch?: BranchDefinition | undefined, callerStack?: Error | undefined);
     updateValue(value: SubscriptionValue<D, any>): void;
     handleUpdate(update: RawCoValue | typeof CoValueLoadingState.UNAVAILABLE): void;
     computeChildErrors(): JazzError | undefined;
     handleChildUpdate: (id: string, value: SubscriptionValue<any, any> | SubscriptionValueLoading, key?: string) => void;
     shouldSendUpdates(): boolean;
     unloadedValue: NotLoaded<D> | undefined;
+    lastPromise: {
+        value: MaybeLoaded<D> | undefined;
+        promise: PromiseWithStatus<MaybeLoaded<D>>;
+    } | undefined;
+    cachePromise(value: MaybeLoaded<D>, callback: () => PromiseWithStatus<D>): PromiseWithStatus<MaybeLoaded<D>>;
+    getPromise(): PromiseWithStatus<unknown>;
     private getUnloadedValue;
+    lastErrorLogged: JazzError | undefined;
     getCurrentValue(): MaybeLoaded<D>;
     getCurrentRawValue(): D | NotLoadedCoValueState;
+    getCreationStackLines(): string;
+    getError(): JazzError | undefined;
+    logError(): void;
     triggerUpdate(): void;
     subscribers: Set<(value: SubscriptionValue<D, any>) => void>;
+    subscriberChangeCallbacks: Set<(count: number) => void>;
+    /**
+     * Subscribe to subscriber count changes
+     * Callback receives the total number of subscribers
+     * Returns an unsubscribe function
+     */
+    onSubscriberChange(callback: (count: number) => void): () => void;
+    private notifySubscriberChange;
     subscribe(listener: (value: SubscriptionValue<D, any>) => void): () => void;
     setListener(listener: (value: SubscriptionValue<D, any>) => void): void;
     subscribeToKey(key: string): void;

package/dist/tools/subscribe/SubscriptionScope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionScope.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionScope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubscriptionScope.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionScope.ts"],"names":[],"mappings":"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"}

package/dist/tools/subscribe/errorReporting.d.ts

@@ -0,0 +1,31 @@
+import type { JazzError } from "./JazzError";
+type CustomErrorReporterProps = {
+    getPrettyStackTrace: () => string;
+    jazzError: JazzError;
+};
+type CustomErrorReporter = (error: Error, props: CustomErrorReporterProps) => void;
+/**
+ * Turns on the additonal debug info coming from React hooks on the original subscription of the errors.
+ *
+ * Enabled by default in development mode.
+ */
+export declare function enableCaptureErrorCause(capture: boolean): void;
+/**
+ * Set a custom error reporter to be used instead of the default console.error.
+ *
+ * Useful for sending errors to a logging service or silence some annoying errors in production.
+ */
+export declare function setCustomErrorReporter(reporter?: CustomErrorReporter): void;
+/**
+ * Check if we're in development mode.
+ * Stack traces are only captured in development to avoid overhead in production.
+ */
+export declare function isCustomErrorReportingEnabled(): boolean;
+/**
+ * Capture a stack trace only in development mode.
+ * Returns undefined in production to avoid overhead.
+ */
+export declare function captureStack(): Error | undefined;
+export declare function captureError(error: Error, props: CustomErrorReporterProps): void;
+export {};
+//# sourceMappingURL=errorReporting.d.ts.map

package/dist/tools/subscribe/errorReporting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errorReporting.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/errorReporting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAe7C,KAAK,wBAAwB,GAAG;IAC9B,mBAAmB,EAAE,MAAM,MAAM,CAAC;IAClC,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG,CACzB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,wBAAwB,KAC5B,IAAI,CAAC;AAKV;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAEvD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,QAEpE;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,OAAO,CAEvD;AAED;;;GAGG;AACH,wBAAgB,YAAY,sBAE3B;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,wBAAwB,QAIzE"}

package/dist/tools/subscribe/utils.d.ts

@@ -1,5 +1,5 @@
 import { RawCoValue, Role } from "cojson";
-import { CoValue, RefEncoded } from "../internal.js";
+import { CoValue, RefEncoded, RefsToResolve } from "../internal.js";
 import { SubscriptionScope } from "./SubscriptionScope.js";
 export declare function myRoleForRawValue(raw: RawCoValue): Role | undefined;
 export declare function createCoValue<D extends CoValue>(ref: RefEncoded<D>, raw: RawCoValue, subscriptionScope: SubscriptionScope<D>): {
@@ -7,4 +7,12 @@ export declare function createCoValue<D extends CoValue>(ref: RefEncoded<D>, raw
     value: D;
     id: string;
 };
+export type PromiseWithStatus<T> = PromiseLike<T> & {
+    status?: "pending" | "fulfilled" | "rejected";
+    value?: T;
+    reason?: unknown;
+};
+export declare function resolvedPromise<T>(value: T): PromiseWithStatus<T>;
+export declare function rejectedPromise<T>(reason: unknown): PromiseWithStatus<T>;
+export declare function isEqualRefsToResolve(a: RefsToResolve<any>, b: RefsToResolve<any>): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/dist/tools/subscribe/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtD,OAAO,EACL,OAAO,EACP,UAAU,EAGX,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,CAUnE;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtD,OAAO,EACL,OAAO,EACP,UAAU,EACV,aAAa,EAGd,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,CAUnE;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC;AAED,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG;IAClD,MAAM,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,UAAU,CAAC;IAC9C,KAAK,CAAC,EAAE,CAAC,CAAC;IACV,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAKjE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAKxE;AAED,wBAAgB,oBAAoB,CAClC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,EACrB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,WAoDtB"}

package/dist/tools/testing.d.ts

@@ -1,6 +1,6 @@
 import { LocalNode } from "cojson";
 import { PureJSCrypto } from "cojson/dist/crypto/PureJSCrypto";
-import { Account, AccountClass, type AnonymousJazzAgent, CoValueFromRaw, CoreAccountSchema, InstanceOfSchema, JazzContextManager, JazzContextManagerAuthProps, JazzContextManagerBaseProps, CoValue } from "./internal.js";
+import { Account, AccountClass, type AnonymousJazzAgent, CoValueFromRaw, CoreAccountSchema, InstanceOfSchema, JazzContextManager, JazzContextManagerAuthProps, JazzContextManagerBaseProps } from "./internal.js";
 export { assertLoaded } from "./lib/utils.js";
 export declare class TestJSCrypto extends PureJSCrypto {
     static create(): Promise<PureJSCrypto>;
@@ -50,7 +50,7 @@ export declare class TestJazzContextManager<Acc extends Account> extends JazzCon
             fromNode: (typeof Account)["fromNode"];
         } & CoValueFromRaw<Acc> extends infer T ? T extends import("./internal.js").CoValueClass<Acc> & {
             fromNode: (typeof Account)["fromNode"];
-        } & CoValueFromRaw<Acc> ? T extends import("./internal.js").CoValueClass<CoValue> ? InstanceType<T> : never : never : never;
+        } & CoValueFromRaw<Acc> ? T extends import("./internal.js").CoValueClass<import("./internal.js").CoValue> ? InstanceType<T> : never : never : never;
         node: LocalNode;
         done: () => void;
         logOut: () => Promise<void>;

package/dist/tools/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/tools/testing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/tools/testing.ts"],"names":[],"mappings":"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"}

package/dist/tools/tests/SubscriptionCache.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SubscriptionCache.test.d.ts.map

package/dist/tools/tests/SubscriptionCache.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubscriptionCache.test.d.ts","sourceRoot":"","sources":["../../../src/tools/tests/SubscriptionCache.test.ts"],"names":[],"mappings":""}

package/dist/tools/tests/errorReporting.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=errorReporting.test.d.ts.map

package/dist/tools/tests/errorReporting.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errorReporting.test.d.ts","sourceRoot":"","sources":["../../../src/tools/tests/errorReporting.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -62,6 +62,10 @@
       "types": "./dist/expo/testing.d.ts",
       "default": "./dist/expo/testing.js"
     },
+    "./expo/polyfills": {
+      "@jazz-tools/source": "./src/react-native-core/polyfills/index.js",
+      "default": "./dist/expo/polyfills.js"
+    },
     "./inspector": {
       "@jazz-tools/source": "./src/inspector/index.ts",
       "types": "./dist/inspector/index.d.ts",
@@ -117,6 +121,10 @@
       "types": "./dist/react-native/testing.d.ts",
       "default": "./dist/react-native/testing.js"
     },
+    "./react-native/polyfills": {
+      "@jazz-tools/source": "./src/react-native-core/polyfills/index.js",
+      "default": "./dist/react-native/polyfills.js"
+    },
     "./react-native-core": {
       "@jazz-tools/source": "./src/react-native-core/index.ts",
       "types": "./dist/react-native-core/index.d.ts",
@@ -183,11 +191,16 @@
       "@jazz-tools/source": "./src/worker/napi-crypto.ts",
       "types": "./dist/worker/napi-crypto.d.ts",
       "default": "./dist/worker/napi-crypto.js"
+    },
+    "./react-native-core/crypto/RNCrypto": {
+      "@jazz-tools/source": "./src/react-native-core/crypto/RNCrypto.ts",
+      "types": "./dist/react-native-core/crypto/RNCrypto.d.ts",
+      "default": "./dist/react-native-core/crypto/RNCrypto.js"
     }
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.19.7",
+  "version": "0.19.10",
   "dependencies": {
     "@manuscripts/prosemirror-recreate-steps": "^0.1.4",
     "@scure/base": "1.2.1",
@@ -204,9 +217,9 @@
     "prosemirror-transform": "^1.9.0",
     "use-sync-external-store": "^1.5.0",
     "zod": "4.1.11",
-    "cojson": "0.19.7",
-    "cojson-storage-indexeddb": "0.19.7",
-    "cojson-transport-ws": "0.19.7"
+    "cojson": "0.19.10",
+    "cojson-storage-indexeddb": "0.19.10",
+    "cojson-transport-ws": "0.19.10"
   },
   "devDependencies": {
     "@scure/bip39": "^1.3.0",
@@ -220,10 +233,12 @@
     "@types/react-dom": "19.1.0",
     "@types/use-sync-external-store": "^1.5.0",
     "@vitest/browser": "^3.2.4",
+    "libsql": "^0.5.13",
     "msw": "^2.10.3",
     "oauth2-mock-server": "^8.1.0",
     "playwright": "^1.50.1",
     "queueueue": "^4.1.2",
+    "react-error-boundary": "^6.0.0",
     "tsup": "8.5.0",
     "typescript": "5.6.2",
     "vitest": "3.2.4",
@@ -234,14 +249,14 @@
     "@op-engineering/op-sqlite": "*",
     "@react-native-community/netinfo": "*",
     "better-auth": "^1.3.2",
-    "expo-image-manipulator": "*",
     "expo-file-system": "*",
+    "expo-image-manipulator": "*",
     "expo-secure-store": "*",
     "expo-sqlite": "*",
     "react": "*",
     "react-dom": "*",
     "react-native": "*",
-    "react-native-fast-encoder": "^0.2.0",
+    "react-native-fast-encoder": "^0.3.1",
     "react-native-mmkv": "^3.3.0",
     "react-native-nitro-modules": "^0.26.4",
     "react-native-quick-crypto": "^1.0.0-beta.21",
@@ -305,7 +320,7 @@
     "check": "tsc --noEmit",
     "format-and-lint": "biome check .",
     "format-and-lint:fix": "biome check . --write",
-    "dev": "tsup --watch --dts",
+    "dev": "tsup --watch",
     "bench": "vitest bench --run --root ../../ --project jazz-tools",
     "test": "vitest --run --root ../../ --project jazz-tools",
     "test:watch": "vitest --watch --root ../../ --project jazz-tools",

package/src/react/hooks.tsx

@@ -56,4 +56,6 @@ export {
   useCoValueSubscription,
   useAccountSubscription,
   useSubscriptionSelector,
+  useSuspenseAccount,
+  useSuspenseCoState,
 } from "jazz-tools/react-core";

package/src/react/index.ts

@@ -1,19 +1,6 @@
 export { JazzReactProvider } from "./provider.js";
 export type { JazzProviderProps } from "./provider.js";
-export {
-  useAccount,
-  useCoState,
-  useAcceptInvite,
-  experimental_useInboxSender,
-  useJazzContext,
-  useAuthSecretStorage,
-  useAgent,
-  useLogOut,
-  useSyncConnectionStatus,
-  useCoValueSubscription,
-  useAccountSubscription,
-  useSubscriptionSelector,
-} from "./hooks.js";
+export * from "./hooks.js";
 
 export {
   createCoValueSubscriptionContext,

package/src/react-core/hooks.ts

@@ -2,6 +2,7 @@ import { useSyncExternalStoreWithSelector } from "use-sync-external-store/shim/w
 import React, {
   useCallback,
   useContext,
+  useMemo,
   useRef,
   useSyncExternalStore,
 } from "react";
@@ -22,18 +23,20 @@ import {
   Loaded,
   MaybeLoaded,
   NotLoaded,
+  RefsToResolve,
   ResolveQuery,
   ResolveQueryStrict,
   SchemaResolveQuery,
   SubscriptionScope,
-  coValueClassFromCoValueClassOrSchema,
   importContentPieces,
+  captureStack,
   getUnloadedCoValueWithoutId,
   type BranchDefinition,
 } from "jazz-tools";
 import { JazzContext, JazzContextManagerContext } from "./provider.js";
 import { getCurrentAccountFromContextManager } from "./utils.js";
 import { CoValueSubscription } from "./types.js";
+import { use } from "./use.js";
 
 export function useJazzContext<Acc extends Account>() {
   const value = useContext(JazzContext) as JazzContextType<Acc>;
@@ -104,6 +107,12 @@ export function useCoValueSubscription<
   const contextManager = useJazzContextManager();
   const agent = useAgent();
 
+  const callerStack = React.useRef<Error | undefined>(undefined);
+
+  if (!callerStack.current) {
+    callerStack.current = captureStack();
+  }
+
   const createSubscription = () => {
     if (!id) {
       return {
@@ -126,19 +135,22 @@ export function useCoValueSubscription<
     const resolve = getResolveQuery(Schema, options?.resolve);
 
     const node = contextManager.getCurrentValue()!.node;
-    const subscription = new SubscriptionScope<any>(
+    const cache = contextManager.getSubscriptionScopeCache();
+    const subscription = cache.getOrCreate(
       node,
-      resolve,
+      Schema,
       id,
-      {
-        ref: coValueClassFromCoValueClassOrSchema(Schema),
-        optional: true,
-      },
+      resolve,
       false,
       false,
       options?.unstable_branch,
     );
 
+    // Set callerStack on returned subscription after retrieval
+    if (callerStack.current) {
+      subscription.callerStack = callerStack.current;
+    }
+
     return {
       value: subscription,
       contextManager,
@@ -173,7 +185,6 @@ export function useCoValueSubscription<
     subscription.branchOwnerId !== branchOwnerId ||
     subscription.agent !== agent
   ) {
-    subscription.value?.destroy();
     subscriptionRef.current = createSubscription();
     subscription = subscriptionRef.current;
   }
@@ -433,6 +444,79 @@ export function useCoState<
   return value;
 }
 
+export function useSuspenseCoState<
+  S extends CoValueClassOrSchema,
+  // @ts-expect-error we can't statically enforce the schema's resolve query is a valid resolve query, but in practice it is
+  const R extends ResolveQuery<S> = SchemaResolveQuery<S>,
+  TSelectorReturn = Loaded<S, R>,
+>(
+  /** The CoValue schema or class constructor */
+  Schema: S,
+  /** The ID of the CoValue to subscribe to */
+  id: string,
+  /** Optional configuration for the subscription */
+  options?: {
+    /** Resolve query to specify which nested CoValues to load */
+    resolve?: ResolveQueryStrict<S, R>;
+    /** Select which value to return */
+    select?: (value: Loaded<S, R>) => TSelectorReturn;
+    /** Equality function to determine if the selected value has changed, defaults to `Object.is` */
+    equalityFn?: (a: TSelectorReturn, b: TSelectorReturn) => boolean;
+    /**
+     * Create or load a branch for isolated editing.
+     *
+     * Branching lets you take a snapshot of the current state and start modifying it without affecting the canonical/shared version.
+     * It's a fork of your data graph: the same schema, but with diverging values.
+     *
+     * The checkout of the branch is applied on all the resolved values.
+     *
+     * @param name - A unique name for the branch. This identifies the branch
+     *   and can be used to switch between different branches of the same CoValue.
+     * @param owner - The owner of the branch. Determines who can access and modify
+     *   the branch. If not provided, the branch is owned by the current user.
+     *
+     * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
+     */
+    unstable_branch?: BranchDefinition;
+    preloaded?: ExportedCoValue<Loaded<S, R>>;
+  },
+): TSelectorReturn {
+  useImportCoValueContent(id, options?.preloaded);
+
+  const subscription = useCoValueSubscription(Schema, id, options);
+
+  if (!subscription) {
+    throw new Error("Subscription not found");
+  }
+
+  use(subscription.getPromise());
+
+  const getCurrentValue = () => {
+    const value = subscription.getCurrentValue();
+
+    if (!value.$isLoaded) {
+      throw new Error("CoValue must be loaded in a suspense context");
+    }
+
+    return value;
+  };
+
+  const value = useSyncExternalStoreWithSelector<Loaded<S, R>, TSelectorReturn>(
+    React.useCallback(
+      (callback) => {
+        return subscription.subscribe(callback);
+      },
+      [subscription],
+    ),
+    getCurrentValue,
+    getCurrentValue,
+    options?.select ?? ((value) => value as TSelectorReturn),
+    options?.equalityFn ?? Object.is,
+  );
+
+  return value;
+}
+
 export function useSubscriptionSelector<
   S extends CoValueClassOrSchema,
   // @ts-expect-error we can't statically enforce the schema's resolve query is a valid resolve query, but in practice it is
@@ -481,6 +565,12 @@ export function useAccountSubscription<
 ) {
   const contextManager = useJazzContextManager();
 
+  // Capture stack trace at hook call time
+  const callerStack = React.useRef<Error | undefined>(undefined);
+  if (!callerStack.current) {
+    callerStack.current = captureStack();
+  }
+
   const createSubscription = () => {
     const agent = getCurrentAccountFromContextManager(contextManager);
 
@@ -495,19 +585,22 @@ export function useAccountSubscription<
     const resolve = getResolveQuery(Schema, options?.resolve);
 
     const node = contextManager.getCurrentValue()!.node;
-    const subscription = new SubscriptionScope<any>(
+    const cache = contextManager.getSubscriptionScopeCache();
+    const subscription = cache.getOrCreate(
       node,
-      resolve,
+      Schema,
       agent.$jazz.id,
-      {
-        ref: coValueClassFromCoValueClassOrSchema(Schema),
-        optional: true,
-      },
+      resolve,
       false,
       false,
       options?.unstable_branch,
     );
 
+    // Set callerStack on returned subscription after retrieval
+    if (callerStack.current) {
+      subscription.callerStack = callerStack.current;
+    }
+
     return {
       subscription,
       contextManager,
@@ -529,12 +622,12 @@ export function useAccountSubscription<
       subscription.branchName !== options?.unstable_branch?.name ||
       subscription.branchOwnerId !== options?.unstable_branch?.owner?.$jazz.id
     ) {
-      subscription.subscription?.destroy();
+      // No need to manually destroy - cache handles cleanup via SubscriptionScope lifecycle
       setSubscription(createSubscription());
     }
 
     return contextManager.subscribe(() => {
-      subscription.subscription?.destroy();
+      // No need to manually destroy - cache handles cleanup via SubscriptionScope lifecycle
       setSubscription(createSubscription());
     });
   }, [Schema, contextManager, branchName, branchOwnerId]);
@@ -689,6 +782,78 @@ export function useAccount<
   );
 }
 
+export function useSuspenseAccount<
+  A extends AccountClass<Account> | AnyAccountSchema,
+  // @ts-expect-error we can't statically enforce the schema's resolve query is a valid resolve query, but in practice it is
+  const R extends ResolveQuery<A> = SchemaResolveQuery<A>,
+  TSelectorReturn = Loaded<A, R>,
+>(
+  /** The account schema to use. Defaults to the base Account schema */
+  AccountSchema: A = Account as unknown as A,
+  /** Optional configuration for the subscription */
+  options?: {
+    /** Resolve query to specify which nested CoValues to load from the account */
+    resolve?: ResolveQueryStrict<A, R>;
+    /** Select which value to return from the account data */
+    select?: (account: Loaded<A, R>) => TSelectorReturn;
+    /** Equality function to determine if the selected value has changed, defaults to `Object.is` */
+    equalityFn?: (a: TSelectorReturn, b: TSelectorReturn) => boolean;
+    /**
+     * Create or load a branch for isolated editing.
+     *
+     * Branching lets you take a snapshot of the current state and start modifying it without affecting the canonical/shared version.
+     * It's a fork of your data graph: the same schema, but with diverging values.
+     *
+     * The checkout of the branch is applied on all the resolved values.
+     *
+     * @param name - A unique name for the branch. This identifies the branch
+     *   and can be used to switch between different branches of the same CoValue.
+     * @param owner - The owner of the branch. Determines who can access and modify
+     *   the branch. If not provided, the branch is owned by the current user.
+     *
+     * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
+     */
+    unstable_branch?: BranchDefinition;
+  },
+): TSelectorReturn {
+  const subscription = useAccountSubscription(AccountSchema, options);
+
+  if (!subscription) {
+    throw new Error(
+      "Subscription not found, are you using useSuspenseAccount in guest mode?",
+    );
+  }
+
+  use(subscription.getPromise());
+
+  const getCurrentValue = () => {
+    const value = subscription.getCurrentValue();
+
+    if (!value.$isLoaded) {
+      throw new Error("Account must be loaded in a suspense context");
+    }
+
+    return value;
+  };
+
+  return useSyncExternalStoreWithSelector<Loaded<A, R>, TSelectorReturn>(
+    React.useCallback(
+      (callback) => {
+        if (!subscription) {
+          return () => {};
+        }
+
+        return subscription.subscribe(callback);
+      },
+      [subscription],
+    ),
+    getCurrentValue,
+    getCurrentValue,
+    options?.select ?? ((value) => value as TSelectorReturn),
+    options?.equalityFn ?? Object.is,
+  );
+}
+
 /**
  * Returns a function for logging out of the current account.
  */