foldkit 0.102.0 → 0.103.0

package/dist/managedResource/public.d.ts

@@ -1,5 +1,5 @@
 export { tag, ResourceNotAvailable } from './index.js';
 export type { ManagedResource, ManagedResourceService, Value, ServiceOf, } from './index.js';
-export { makeManagedResources } from '../runtime/managedResource.js';
-export type { ManagedResourceConfig, ManagedResources, ManagedResourceServicesOf, } from '../runtime/managedResource.js';
+export { make, lift, aggregate } from '../runtime/managedResource.js';
+export type { Entry, ManagedResources, ManagedResourceConfig, ServicesOf, } from '../runtime/managedResource.js';
 //# sourceMappingURL=public.d.ts.map

package/dist/managedResource/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/managedResource/public.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,YAAY,EACV,eAAe,EACf,sBAAsB,EACtB,KAAK,EACL,SAAS,GACV,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AAEpE,YAAY,EACV,qBAAqB,EACrB,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,+BAA+B,CAAA"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/managedResource/public.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,YAAY,EACV,eAAe,EACf,sBAAsB,EACtB,KAAK,EACL,SAAS,GACV,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAErE,YAAY,EACV,KAAK,EACL,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,GACX,MAAM,+BAA+B,CAAA"}

package/dist/managedResource/public.js

@@ -1,2 +1,2 @@
 export { tag, ResourceNotAvailable } from './index.js';
-export { makeManagedResources } from '../runtime/managedResource.js';
+export { make, lift, aggregate } from '../runtime/managedResource.js';

package/dist/runtime/managedResource.d.ts

@@ -1,33 +1,88 @@
-import { type Effect, type Option, type Schema } from 'effect';
+import { type Effect, Option, type Schema } from 'effect';
 import type { ManagedResource } from '../managedResource/index.js';
-/** Internal configuration for a single managed resource, used by the runtime. */
+/** Internal configuration for a single Managed Resource, used by the runtime. */
 export type ManagedResourceConfig<Model, Message> = {
     readonly schema: Schema.Schema<any>;
     readonly resource: ManagedResource<any>;
-    readonly modelToMaybeRequirements: (model: Model) => unknown;
-    readonly acquire: (params: unknown) => Effect.Effect<unknown, unknown>;
-    readonly release: (value: unknown) => Effect.Effect<void>;
-    readonly onAcquired: (value: unknown) => Message;
+    readonly modelToMaybeRequirements: (model: Model) => any;
+    readonly acquire: (params: any) => Effect.Effect<any, unknown>;
+    readonly release: (value: any) => Effect.Effect<void>;
+    readonly onAcquired: (value: any) => Message;
     readonly onReleased: () => Message;
     readonly onAcquireError: (error: unknown) => Message;
 };
-declare const ManagedResourceServicesPhantom: unique symbol;
-/** A record of named managed resource configurations, keyed by dependency field name. */
+/** A record of named Managed Resource configurations, keyed by resource name. */
 export type ManagedResources<Model, Message, Services = never> = Record<string, ManagedResourceConfig<Model, Message>> & {
-    readonly [ManagedResourceServicesPhantom]?: Services;
+    readonly __managedResourceServices?: Services;
 };
-/** Type-level utility to extract the service union from a ManagedResources type. */
-export type ManagedResourceServicesOf<MR> = MR extends ManagedResources<any, any, infer S> ? S : never;
+type EntryBrand = {
+    readonly __managedResourceEntry: never;
+};
+/**
+ * The requirements value the runtime hands to `acquire`. When the requirements
+ * schema is wrapped in `S.Option`, the runtime unwraps the `Some` before
+ * calling `acquire`, so the parameter is the inner type.
+ */
+type AcquireParams<Requirements> = Requirements extends Option.Option<infer Params> ? Params : Requirements;
+/**
+ * A single Managed Resource entry produced by `ManagedResource.make`,
+ * `ManagedResource.lift`, or `ManagedResource.aggregate`. The brand field is
+ * `never`, so application code cannot manually construct one: it must go
+ * through a constructor.
+ *
+ * The `Service` parameter carries the resource tag's identity so `make`,
+ * `lift`, and `aggregate` can union the services a record requires. Read the
+ * union off a finished record with `ManagedResource.ServicesOf`.
+ */
+export type Entry<Model, Message, Requirements, Service = unknown> = {
+    readonly schema: Schema.Schema<Requirements>;
+    readonly resource: ManagedResource<any, Service>;
+    readonly modelToMaybeRequirements: (model: Model) => Requirements;
+    readonly acquire: (params: AcquireParams<Requirements>) => Effect.Effect<any, unknown>;
+    readonly release: (value: any) => Effect.Effect<void>;
+    readonly onAcquired: (value: any) => Message;
+    readonly onReleased: () => Message;
+    readonly onAcquireError: (error: unknown) => Message;
+} & EntryBrand;
+/** Type-level utility to extract the service union from a Managed Resources record. */
+export type ServicesOf<Resources> = {
+    [Key in keyof Resources]: Resources[Key] extends {
+        readonly resource: ManagedResource<any, infer Service>;
+    } ? Service : never;
+}[keyof Resources];
+/**
+ * Builds a single Managed Resource entry from a requirements schema and a
+ * config. Reading the schema as a positional argument (rather than a property
+ * on the config literal) lets TypeScript fully resolve the requirements type
+ * before contextually typing `modelToMaybeRequirements` and `acquire`, so
+ * destructuring patterns are inferred correctly even when the schema uses
+ * transforms like `S.Option`.
+ */
+export type EntryBuilder<Model, Message> = <RequirementsSchema extends Schema.Schema<any>, Service>(schema: RequirementsSchema, config: {
+    readonly resource: ManagedResource<any, Service>;
+    readonly modelToMaybeRequirements: (model: Model) => Schema.Schema.Type<RequirementsSchema>;
+    readonly acquire: (params: AcquireParams<Schema.Schema.Type<RequirementsSchema>>) => Effect.Effect<any, unknown>;
+    readonly release: (value: any) => Effect.Effect<void>;
+    readonly onAcquired: (value: any) => Message;
+    readonly onReleased: () => Message;
+    readonly onAcquireError: (error: unknown) => Message;
+}) => Entry<Model, Message, Schema.Schema.Type<RequirementsSchema>, Service>;
 /**
- * Creates type-safe managed resource configurations from a dependency schema.
+ * Declares a Managed Resources record. The Model and Message generics are
+ * provided up front; the entries record follows, built from calls to the
+ * `entry` builder passed into the inner function.
  *
  * Use this when a resource is expensive or stateful and should only exist while
- * the model is in a particular state — a camera stream during a video call, a
+ * the model is in a particular state: a camera stream during a video call, a
  * WebSocket connection while on a chat page, or a Web Worker pool during a
  * computation. For resources that live for the entire application lifetime, use
  * the static `resources` config instead.
  *
- * **Lifecycle** — The runtime watches each config's `modelToMaybeRequirements`
+ * Reach for `ManagedResource.aggregate` to combine multiple records, and
+ * `ManagedResource.lift` to translate a child Submodel's record into a parent
+ * context.
+ *
+ * **Lifecycle** — The runtime watches each entry's `modelToMaybeRequirements`
  * after every model update, structurally comparing the result against the
  * previous value:
  *
@@ -39,8 +94,8 @@ export type ManagedResourceServicesOf<MR> = MR extends ManagedResources<any, any
  *   dispatches `onReleased()`. No re-acquisition occurs.
  *
  * If `acquire` fails, `onAcquireError` is dispatched and the resource daemon
- * continues watching for the next deps change — a failed acquisition does not
- * crash the application.
+ * continues watching for the next requirements change: a failed acquisition
+ * does not crash the application.
  *
  * **Config fields:**
  *
@@ -49,13 +104,12 @@ export type ManagedResourceServicesOf<MR> = MR extends ManagedResources<any, any
  * - `modelToMaybeRequirements` — Extracts requirements from the model.
  *   `Option.none()` means "release", `Option.some(params)` means
  *   "acquire/re-acquire if params changed". For resources with no
- *   parameters, use `S.Option(S.Null)` and return `Option.some(null)` —
- *   not `S.Struct({})`, which has no fields for equivalence comparison.
+ *   parameters, use `S.Option(S.Null)` and return `Option.some(null)`.
  * - `acquire` — Creates the resource from the unwrapped params. The returned
- *   Effect should fail when acquisition fails — errors in the error channel
+ *   Effect should fail when acquisition fails: errors in the error channel
  *   flow to `onAcquireError` as a message instead of crashing the runtime.
  * - `release` — Tears down the resource. Errors thrown here are silently
- *   swallowed — release must not block cleanup.
+ *   swallowed: release must not block cleanup.
  * - `onAcquired` — Message dispatched when `acquire` succeeds.
  * - `onAcquireError` — Message dispatched when `acquire` fails.
  * - `onReleased` — Message dispatched after `release` completes.
@@ -64,14 +118,8 @@ export type ManagedResourceServicesOf<MR> = MR extends ManagedResources<any, any
  * ```ts
  * const CameraStream = ManagedResource.tag<MediaStream>()('CameraStream')
  *
- * const ManagedResourceDeps = S.Struct({
- *   camera: S.Option(S.Struct({ facingMode: S.String })),
- * })
- *
- * const managedResources = ManagedResource.makeManagedResources(
- *   ManagedResourceDeps,
- * )<Model, Message>({
- *   camera: {
+ * const managedResources = ManagedResource.make<Model, Message>()(entry => ({
+ *   camera: entry(S.Option(S.Struct({ facingMode: S.String })), {
  *     resource: CameraStream,
  *     modelToMaybeRequirements: model =>
  *       pipe(
@@ -91,24 +139,37 @@ export type ManagedResourceServicesOf<MR> = MR extends ManagedResources<any, any
  *     onAcquired: () => AcquiredCamera(),
  *     onAcquireError: error => FailedAcquireCamera({ error: String(error) }),
  *     onReleased: () => ReleasedCamera(),
- *   },
- * })
+ *   }),
+ * }))
  * ```
  *
- * @param ManagedResourceDeps - An Effect Schema struct where each field's type
- * drives the requirements for one managed resource. Wrap in `S.Option(...)` for
- * resources that can be released (most cases).
- *
  * @see {@link ManagedResource.tag} for creating the resource identity.
  */
-export declare const makeManagedResources: <ManagedResourceDeps extends Schema.Struct<any>>(ManagedResourceDeps: ManagedResourceDeps) => <Model, Message>(configs: { [K in keyof Schema.Schema.Type<ManagedResourceDeps>]: {
-    readonly resource: ManagedResource<any, any>;
-    readonly modelToMaybeRequirements: (model: Model) => Schema.Schema.Type<ManagedResourceDeps>[K];
-    readonly acquire: (params: Schema.Schema.Type<ManagedResourceDeps>[K] extends Option.Option<infer P> ? P : Schema.Schema.Type<ManagedResourceDeps>[K]) => Effect.Effect<any, unknown>;
-    readonly release: (value: any) => Effect.Effect<void>;
-    readonly onAcquired: (value: any) => Message;
-    readonly onReleased: () => Message;
-    readonly onAcquireError: (error: unknown) => Message;
-}; }) => ManagedResources<Model, Message>;
+export declare const make: <Model, Message>() => <Entries extends Record<string, Entry<Model, Message, any, any>>>(build: (entry: EntryBuilder<Model, Message>) => Entries) => Entries;
+type ChildModelOf<Resources> = Resources[keyof Resources] extends Entry<infer ChildModel, any, any, any> ? ChildModel : never;
+type ChildMessageOf<Resources> = Resources[keyof Resources] extends Entry<any, infer ChildMessage, any, any> ? ChildMessage : never;
+/**
+ * Lifts a record of child Managed Resources into a parent's Model and Message
+ * context, applying a Model accessor and a Message wrapper uniformly to every
+ * entry. Per-entry requirements schemas and resource services are preserved.
+ *
+ * Unlike `Subscription.lift`, `toChildModel` returns an `Option`: a managed
+ * resource already speaks in `Option` (`modelToMaybeRequirements` returns
+ * `Option.none()` to release), and a child Submodel that owns a managed
+ * resource is itself something that mounts and unmounts. A missing child is
+ * just another `None` and flows through the same acquire/release channel, so
+ * each lifted entry's requirements must be `S.Option`-wrapped.
+ */
+export declare const lift: <Resources extends Record<string, Entry<any, any, Option.Option<any>, any>>>(resources: Resources) => <ParentModel, ParentMessage>(config: {
+    readonly toChildModel: (parentModel: ParentModel) => Option.Option<ChildModelOf<Resources>>;
+    readonly toParentMessage: (message: ChildMessageOf<Resources>) => ParentMessage;
+}) => { readonly [Key in keyof Resources]: Resources[Key] extends Entry<any, any, infer Requirements, infer Service> ? Entry<ParentModel, ParentMessage, Requirements, Service> : never; };
+type MergeRecords<Records extends ReadonlyArray<unknown>> = Records extends readonly [infer Head, ...infer Rest] ? Head & (Rest extends ReadonlyArray<unknown> ? MergeRecords<Rest> : {}) : {};
+/**
+ * Combines multiple Managed Resources records into one. Throws on duplicate
+ * keys so a misconfigured aggregate fails loudly at startup rather than
+ * silently overriding.
+ */
+export declare const aggregate: <Model, Message>() => <Records extends ReadonlyArray<Record<string, Entry<Model, Message, any, any>>>>(...records: Records) => MergeRecords<Records>;
 export {};
 //# sourceMappingURL=managedResource.d.ts.map

package/dist/runtime/managedResource.d.ts.map

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

package/dist/runtime/managedResource.js

@@ -1,14 +1,20 @@
-import { Record } from 'effect';
+import { Option, Record } from 'effect';
 /**
- * Creates type-safe managed resource configurations from a dependency schema.
+ * Declares a Managed Resources record. The Model and Message generics are
+ * provided up front; the entries record follows, built from calls to the
+ * `entry` builder passed into the inner function.
  *
  * Use this when a resource is expensive or stateful and should only exist while
- * the model is in a particular state — a camera stream during a video call, a
+ * the model is in a particular state: a camera stream during a video call, a
  * WebSocket connection while on a chat page, or a Web Worker pool during a
  * computation. For resources that live for the entire application lifetime, use
  * the static `resources` config instead.
  *
- * **Lifecycle** — The runtime watches each config's `modelToMaybeRequirements`
+ * Reach for `ManagedResource.aggregate` to combine multiple records, and
+ * `ManagedResource.lift` to translate a child Submodel's record into a parent
+ * context.
+ *
+ * **Lifecycle** — The runtime watches each entry's `modelToMaybeRequirements`
  * after every model update, structurally comparing the result against the
  * previous value:
  *
@@ -20,8 +26,8 @@ import { Record } from 'effect';
  *   dispatches `onReleased()`. No re-acquisition occurs.
  *
  * If `acquire` fails, `onAcquireError` is dispatched and the resource daemon
- * continues watching for the next deps change — a failed acquisition does not
- * crash the application.
+ * continues watching for the next requirements change: a failed acquisition
+ * does not crash the application.
  *
  * **Config fields:**
  *
@@ -30,13 +36,12 @@ import { Record } from 'effect';
  * - `modelToMaybeRequirements` — Extracts requirements from the model.
  *   `Option.none()` means "release", `Option.some(params)` means
  *   "acquire/re-acquire if params changed". For resources with no
- *   parameters, use `S.Option(S.Null)` and return `Option.some(null)` —
- *   not `S.Struct({})`, which has no fields for equivalence comparison.
+ *   parameters, use `S.Option(S.Null)` and return `Option.some(null)`.
  * - `acquire` — Creates the resource from the unwrapped params. The returned
- *   Effect should fail when acquisition fails — errors in the error channel
+ *   Effect should fail when acquisition fails: errors in the error channel
  *   flow to `onAcquireError` as a message instead of crashing the runtime.
  * - `release` — Tears down the resource. Errors thrown here are silently
- *   swallowed — release must not block cleanup.
+ *   swallowed: release must not block cleanup.
  * - `onAcquired` — Message dispatched when `acquire` succeeds.
  * - `onAcquireError` — Message dispatched when `acquire` fails.
  * - `onReleased` — Message dispatched after `release` completes.
@@ -45,14 +50,8 @@ import { Record } from 'effect';
  * ```ts
  * const CameraStream = ManagedResource.tag<MediaStream>()('CameraStream')
  *
- * const ManagedResourceDeps = S.Struct({
- *   camera: S.Option(S.Struct({ facingMode: S.String })),
- * })
- *
- * const managedResources = ManagedResource.makeManagedResources(
- *   ManagedResourceDeps,
- * )<Model, Message>({
- *   camera: {
+ * const managedResources = ManagedResource.make<Model, Message>()(entry => ({
+ *   camera: entry(S.Option(S.Struct({ facingMode: S.String })), {
  *     resource: CameraStream,
  *     modelToMaybeRequirements: model =>
  *       pipe(
@@ -72,21 +71,60 @@ import { Record } from 'effect';
  *     onAcquired: () => AcquiredCamera(),
  *     onAcquireError: error => FailedAcquireCamera({ error: String(error) }),
  *     onReleased: () => ReleasedCamera(),
- *   },
- * })
+ *   }),
+ * }))
  * ```
  *
- * @param ManagedResourceDeps - An Effect Schema struct where each field's type
- * drives the requirements for one managed resource. Wrap in `S.Option(...)` for
- * resources that can be released (most cases).
- *
  * @see {@link ManagedResource.tag} for creating the resource identity.
  */
-export const makeManagedResources = (ManagedResourceDeps) => (configs) => 
-/* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-Record.map(configs, (config, key) => 
+export const make = () => (build) => {
+    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+    const entry = ((schema, config) => ({
+        schema,
+        ...config,
+    }));
+    return build(entry);
+};
+/**
+ * Lifts a record of child Managed Resources into a parent's Model and Message
+ * context, applying a Model accessor and a Message wrapper uniformly to every
+ * entry. Per-entry requirements schemas and resource services are preserved.
+ *
+ * Unlike `Subscription.lift`, `toChildModel` returns an `Option`: a managed
+ * resource already speaks in `Option` (`modelToMaybeRequirements` returns
+ * `Option.none()` to release), and a child Submodel that owns a managed
+ * resource is itself something that mounts and unmounts. A missing child is
+ * just another `None` and flows through the same acquire/release channel, so
+ * each lifted entry's requirements must be `S.Option`-wrapped.
+ */
+export const lift = (resources) => (config) => 
 /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-({
-    schema: ManagedResourceDeps.fields[key],
-    ...config,
+Record.map(resources, resource => ({
+    schema: resource.schema,
+    resource: resource.resource,
+    modelToMaybeRequirements: (parentModel) => Option.flatMap(config.toChildModel(parentModel), resource.modelToMaybeRequirements),
+    acquire: resource.acquire,
+    release: resource.release,
+    onAcquired: (value) => config.toParentMessage(resource.onAcquired(value)),
+    onReleased: () => config.toParentMessage(resource.onReleased()),
+    onAcquireError: (error) => config.toParentMessage(resource.onAcquireError(error)),
 }));
+/**
+ * Combines multiple Managed Resources records into one. Throws on duplicate
+ * keys so a misconfigured aggregate fails loudly at startup rather than
+ * silently overriding.
+ */
+export const aggregate = () => (...records) => {
+    const result = {};
+    for (const record of records) {
+        for (const key of Object.keys(record)) {
+            if (Object.hasOwn(result, key)) {
+                throw new Error(`ManagedResource.aggregate: duplicate key "${key}" across records`);
+            }
+            /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+            result[key] = record[key];
+        }
+    }
+    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+    return result;
+};

package/dist/runtime/runtime.d.ts

@@ -3,6 +3,7 @@ import type { Command } from '../command/index.js';
 import { Document } from '../html/index.js';
 import { UrlRequest } from '../navigation/urlRequest.js';
 import { Url } from '../url/index.js';
+import { VNode } from '../vdom.js';
 import type { ManagedResources } from './managedResource.js';
 import type { Subscriptions } from './subscription.js';
 /** Position of the DevTools badge and panel on screen. */
@@ -88,11 +89,14 @@ export type RoutingConfig<Message> = Readonly<{
     onUrlRequest: (request: UrlRequest) => Message;
     onUrlChange: (url: Url) => Message;
 }>;
-/** Context provided to crash.view and crash.report when the runtime encounters an unrecoverable error. */
+/** Context provided to crash.view and crash.report when the runtime encounters
+ *  an unrecoverable error. `message` is the Message being processed when the
+ *  crash occurred, present as an `Option` because a crash during the initial
+ *  render has no triggering Message. */
 export type CrashContext<Model, Message> = Readonly<{
     error: Error;
     model: Model;
-    message: Message;
+    message: Option.Option<Message>;
 }>;
 /** Configuration for crash handling, with custom crash UI and/or crash reporting. */
 export type CrashConfig<Model, Message> = Readonly<{
@@ -170,6 +174,7 @@ export type MakeRuntimeReturn = Readonly<{
     runtimeId: string;
     start: (hmrModel?: unknown) => Effect.Effect<void>;
 }>;
+export declare const patchVNode: (maybeCurrentVNode: Option.Option<VNode>, nextVNode: VNode | null, container: HTMLElement) => VNode;
 /** Creates a Foldkit program and returns a runtime that can be passed to `run`. Add a `routing` config for URL routing. */
 export declare function makeProgram<Model, Message extends {
     _tag: string;

package/dist/runtime/runtime.d.ts.map

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

package/dist/runtime/runtime.js

@@ -7,7 +7,7 @@ import { startWebSocketBridge } from '../devTools/webSocketBridge.js';
 import { __beginRender as beginHtmlRender, __clearRuntime as clearHtmlRuntime, __createBoundaryRegistry as createHtmlBoundaryRegistry, __setRuntime as setHtmlRuntime, } from '../html/index.js';
 import { MountTracker } from '../mount/index.js';
 import { fromString as urlFromString } from '../url/index.js';
-import { patch, toVNode } from '../vdom.js';
+import { dedupeSharedVNodes, patch, toVNode } from '../vdom.js';
 import { addBfcacheRestoreListener, addNavigationEventListeners, } from './browserListeners.js';
 import { defaultCrashView, noOpDispatch } from './crashUI.js';
 import { deepFreeze } from './deepFreeze.js';
@@ -208,6 +208,16 @@ const makeRuntime = ({ Model, flags: resolveFlags, init, update, view, subscript
         }
         const modelRef = yield* Ref.make(initModel);
         const maybeCurrentVNodeRef = yield* Ref.make(Option.none());
+        // NOTE: shared by every perpetual fiber's crash path (init render,
+        // render loop, message drain). Each fiber catches its own cause so a
+        // failure surfaces as the crash view instead of dying silently and
+        // leaving the DOM frozen at the last successful render.
+        const crashWith = (cause, maybeMessage) => Effect.gen(function* () {
+            const model = yield* Ref.get(modelRef);
+            const squashed = Cause.squash(cause);
+            const error = squashed instanceof Error ? squashed : new Error(String(squashed));
+            renderCrashView({ error, model, message: maybeMessage }, crash, container, maybeCurrentVNodeRef);
+        });
         // NOTE: queue-drain-fiber-local state. Kept as plain closure
         // variables instead of `Ref`s because nothing else reads or writes
         // them concurrently, and JS's single-threaded model already orders
@@ -230,7 +240,7 @@ const makeRuntime = ({ Model, flags: resolveFlags, init, update, view, subscript
         enqueueHigh(message);
         const dispatch = { dispatchAsync, dispatchSync };
         const isRenderPendingRef = yield* SubscriptionRef.make(false);
-        const lastDirtyMessageRef = yield* Ref.make(Option.none());
+        const maybeLastDirtyMessageRef = yield* Ref.make(Option.none());
         const isPausedEffect = Effect.suspend(() => Option.match(maybeDevToolsStore, {
             onNone: () => Effect.succeed(false),
             onSome: ({ stateRef }) => SubscriptionRef.get(stateRef).pipe(Effect.map(({ isPaused }) => isPaused)),
@@ -259,7 +269,7 @@ const makeRuntime = ({ Model, flags: resolveFlags, init, update, view, subscript
             if (currentModel !== nextModel) {
                 yield* Ref.set(modelRef, nextModel);
                 yield* SubscriptionRef.set(isRenderPendingRef, true);
-                yield* Ref.set(lastDirtyMessageRef, Option.some(message));
+                yield* Ref.set(maybeLastDirtyMessageRef, Option.some(message));
                 PubSub.publishUnsafe(modelPubSub, nextModel);
                 yield* schedulePreserveModel(nextModel);
             }
@@ -395,25 +405,28 @@ const makeRuntime = ({ Model, flags: resolveFlags, init, update, view, subscript
                 maybeMessageSchema);
             }
         }
-        yield* render(initModel, Option.none());
+        const initRenderExit = yield* Effect.exit(render(initModel, Option.none()));
+        if (Exit.isFailure(initRenderExit)) {
+            return yield* crashWith(initRenderExit.cause, Option.none());
+        }
         const initMountEvents = drainMountEvents();
         yield* Option.match(maybeDevToolsStore, {
             onNone: () => Effect.void,
             onSome: store => store.recordInit(initModel, Array.map(initCommands, toCommandRecord), initMountEvents.starts),
         });
-        // NOTE: lastDirtyMessageRef holds the most recent dirtying Message, so
-        // slow-view callbacks during high-rate bursts attribute to the last
-        // Message in the frame batch, not the specific one that pushed the
-        // view past threshold. Acceptable for a debug callback; full
-        // attribution would require correlating each message with its render
-        // contribution, which isn't worth the complexity.
+        // NOTE: maybeLastDirtyMessageRef holds the most recent dirtying
+        // Message, so slow-view callbacks during high-rate bursts attribute
+        // to the last Message in the frame batch, not the specific one that
+        // pushed the view past threshold. Acceptable for a debug callback;
+        // full attribution would require correlating each message with its
+        // render contribution, which isn't worth the complexity.
         const renderLoop = makeRenderLoop({
             pendingRef: isRenderPendingRef,
             awaitNextFrame,
             isPaused: isPausedEffect,
             render: Effect.gen(function* () {
                 const model = yield* Ref.get(modelRef);
-                const maybeMessage = yield* Ref.get(lastDirtyMessageRef);
+                const maybeMessage = yield* Ref.get(maybeLastDirtyMessageRef);
                 yield* render(model, maybeMessage);
                 const mountEvents = drainMountEvents();
                 yield* Option.match(maybeDevToolsStore, {
@@ -422,7 +435,10 @@ const makeRuntime = ({ Model, flags: resolveFlags, init, update, view, subscript
                 });
             }),
         });
-        yield* Effect.forkDetach(renderLoop);
+        yield* Effect.forkDetach(renderLoop.pipe(Effect.catchCause(cause => Effect.gen(function* () {
+            const maybeMessage = yield* Ref.get(maybeLastDirtyMessageRef);
+            yield* crashWith(cause, maybeMessage);
+        }))));
         addBfcacheRestoreListener();
         if (subscriptions) {
             yield* pipe(subscriptions, Record.toEntries, Effect.forEach(([_key, { dependenciesSchema, modelToDependencies, keepAliveEquivalence, dependenciesToStream, },]) => Effect.gen(function* () {
@@ -534,25 +550,19 @@ const makeRuntime = ({ Model, flags: resolveFlags, init, update, view, subscript
             const rest = yield* pollAvailable;
             yield* processBatch(Array.prepend(rest, first));
             yield* drainQueue;
-        })), Effect.catchCause(cause => Effect.sync(() => {
-            const squashed = Cause.squash(cause);
-            const appError = squashed instanceof Error
-                ? squashed
-                : new Error(String(squashed));
-            const model = Effect.runSync(Ref.get(modelRef));
-            const message = Option.getOrThrow(currentMessage);
-            renderCrashView({ error: appError, model, message }, crash, container, maybeCurrentVNodeRef);
-        })));
+        })), Effect.catchCause(cause => crashWith(cause, currentMessage)));
     }));
     return { runtimeId, start };
 };
-const patchVNode = (maybeCurrentVNode, nullableNextVNode, container) => {
-    const nextVNode = Predicate.isNotNull(nullableNextVNode)
-        ? nullableNextVNode
+// NOTE: exported for `patchVNode.test.ts` to assert the dedupeSharedVNodes
+// wiring; not part of the public surface (`runtime/public.ts` is curated).
+export const patchVNode = (maybeCurrentVNode, nextVNode, container) => {
+    const dedupedVNode = Predicate.isNotNull(nextVNode)
+        ? dedupeSharedVNodes(nextVNode)
         : h('!');
     return Option.match(maybeCurrentVNode, {
-        onNone: () => patch(toVNode(container), nextVNode),
-        onSome: currentVNode => patch(currentVNode, nextVNode),
+        onNone: () => patch(toVNode(container), dedupedVNode),
+        onSome: currentVNode => patch(currentVNode, dedupedVNode),
     });
 };
 const currentLocationUrl = () => {

package/dist/runtime/subscription.js

@@ -40,7 +40,7 @@ export const aggregate = () => (...records) => {
     const result = {};
     for (const record of records) {
         for (const key of Object.keys(record)) {
-            if (key in result) {
+            if (Object.hasOwn(result, key)) {
                 throw new Error(`Subscription.aggregate: duplicate key "${key}" across records`);
             }
             result[key] = record[key];

package/dist/test/apps/crashOnRender.d.ts

@@ -0,0 +1,64 @@
+import { Effect, Schema as S } from 'effect';
+import * as Command from '../../command/index.js';
+import { type Document } from '../../html/index.js';
+export declare const RawSource: S.Struct<{
+    readonly kind: S.Literal<"Book">;
+    readonly id: S.String;
+}>;
+export type RawSource = typeof RawSource.Type;
+export declare const Source: S.Struct<{
+    readonly kind: S.Literal<"Book">;
+    readonly id: S.String;
+}>;
+export type Source = typeof Source.Type;
+export declare const Model: S.Struct<{
+    readonly sources: S.$Array<S.Struct<{
+        readonly kind: S.Literal<"Book">;
+        readonly id: S.String;
+    }>>;
+}>;
+export type Model = typeof Model.Type;
+export declare const ClickedReload: import("../../schema/index.js").CallableTaggedStruct<"ClickedReload", {}>;
+export declare const LoadedSources: import("../../schema/index.js").CallableTaggedStruct<"LoadedSources", {
+    sources: S.$Array<S.Struct<{
+        readonly kind: S.Literal<"Book">;
+        readonly id: S.String;
+    }>>;
+}>;
+export declare const SelectedSource: import("../../schema/index.js").CallableTaggedStruct<"SelectedSource", {
+    source: S.Struct<{
+        readonly kind: S.Literal<"Book">;
+        readonly id: S.String;
+    }>;
+}>;
+export declare const SubmittedNewSourceId: import("../../schema/index.js").CallableTaggedStruct<"SubmittedNewSourceId", {
+    id: S.String;
+}>;
+export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ClickedReload", {}>, import("../../schema/index.js").CallableTaggedStruct<"LoadedSources", {
+    sources: S.$Array<S.Struct<{
+        readonly kind: S.Literal<"Book">;
+        readonly id: S.String;
+    }>>;
+}>, import("../../schema/index.js").CallableTaggedStruct<"SelectedSource", {
+    source: S.Struct<{
+        readonly kind: S.Literal<"Book">;
+        readonly id: S.String;
+    }>;
+}>, import("../../schema/index.js").CallableTaggedStruct<"SubmittedNewSourceId", {
+    id: S.String;
+}>]>;
+export type Message = typeof Message.Type;
+export declare const reloadedSources: ReadonlyArray<RawSource>;
+export declare const ReloadSources: Command.CommandDefinitionNoArgs<"ReloadSources", Effect.Effect<{
+    readonly _tag: "LoadedSources";
+    readonly sources: readonly {
+        readonly kind: "Book";
+        readonly id: string;
+    }[];
+}, never, never>>;
+export declare const validSources: ReadonlyArray<RawSource>;
+export declare const malformedSources: ReadonlyArray<RawSource>;
+export declare const initialModel: Model;
+export declare const update: (model: Model, message: Message) => readonly [Model, ReadonlyArray<Command.Command<Message>>];
+export declare const view: (model: Model) => Document;
+//# sourceMappingURL=crashOnRender.d.ts.map

package/dist/test/apps/crashOnRender.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crashOnRender.d.ts","sourceRoot":"","sources":["../../../src/test/apps/crashOnRender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAE/D,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,KAAK,QAAQ,EAAQ,MAAM,qBAAqB,CAAA;AAMzD,eAAO,MAAM,SAAS;;;EAGpB,CAAA;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAA;AAK7C,eAAO,MAAM,MAAM;;;EAGjB,CAAA;AACF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,KAAK;;;;;EAEhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,aAAa;;;;;EAAsD,CAAA;AAChF,eAAO,MAAM,cAAc;;;;;EAA0C,CAAA;AACrE,eAAO,MAAM,oBAAoB;;EAA8C,CAAA;AAE/E,eAAO,MAAM,OAAO;;;;;;;;;;;;IAKlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAMzC,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,SAAS,CAGpD,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;iBAGoC,CAAA;AAI9D,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,SAAS,CAEjD,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,SAAS,CAErD,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,KAAiC,CAAA;AAI5D,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAiBxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,KAAG,QA8BnC,CAAA"}

package/dist/test/apps/crashOnRender.js

@@ -0,0 +1,72 @@
+import { Array, Effect, Match as M, Schema as S } from 'effect';
+import * as Command from '../../command/index.js';
+import { html } from '../../html/index.js';
+import { m } from '../../message/index.js';
+import { evo } from '../../struct/index.js';
+// MODEL
+export const RawSource = S.Struct({
+    kind: S.Literal('Book'),
+    id: S.String,
+});
+// NOTE: the strict counterpart of RawSource, requiring a non-empty id.
+// Constructing one (or a SelectedSource Message carrying one) from an empty id
+// throws at construction time, which is what drives the render and update crash.
+export const Source = S.Struct({
+    kind: S.Literal('Book'),
+    id: S.String.check(S.isNonEmpty()),
+});
+export const Model = S.Struct({
+    sources: S.Array(RawSource),
+});
+// MESSAGE
+export const ClickedReload = m('ClickedReload');
+export const LoadedSources = m('LoadedSources', { sources: S.Array(RawSource) });
+export const SelectedSource = m('SelectedSource', { source: Source });
+export const SubmittedNewSourceId = m('SubmittedNewSourceId', { id: S.String });
+export const Message = S.Union([
+    ClickedReload,
+    LoadedSources,
+    SelectedSource,
+    SubmittedNewSourceId,
+]);
+// COMMAND
+// NOTE: the malformed entry (empty id) sits inertly as a RawSource until the
+// view rebuilds its SelectedSource handler, which constructs a Source and throws.
+export const reloadedSources = [
+    { kind: 'Book', id: '1' },
+    { kind: 'Book', id: '' },
+];
+export const ReloadSources = Command.define('ReloadSources', LoadedSources)(Effect.succeed(LoadedSources({ sources: reloadedSources })));
+// INIT
+export const validSources = [
+    { kind: 'Book', id: '1' },
+];
+export const malformedSources = [
+    { kind: 'Book', id: '' },
+];
+export const initialModel = { sources: validSources };
+// UPDATE
+export const update = (model, message) => M.value(message).pipe(M.withReturnType(), M.tagsExhaustive({
+    ClickedReload: () => [model, [ReloadSources()]],
+    LoadedSources: ({ sources }) => [
+        evo(model, { sources: () => sources }),
+        [],
+    ],
+    SelectedSource: () => [model, []],
+    SubmittedNewSourceId: ({ id }) => {
+        const source = Source.make({ kind: 'Book', id });
+        return [evo(model, { sources: Array.append(source) }), []];
+    },
+}));
+// VIEW
+export const view = (model) => {
+    const h = html();
+    const body = h.div([], [
+        h.button([h.OnClick(ClickedReload()), h.Role('button')], ['Reload']),
+        h.button([h.OnClick(SubmittedNewSourceId({ id: '' })), h.Role('button')], ['Add source']),
+        h.ul([h.Role('list')], Array.map(model.sources, source => h.keyed('li')(source.id, [], [
+            h.button([h.OnClick(SelectedSource({ source })), h.Role('button')], [`Select ${source.id}`]),
+        ]))),
+    ]);
+    return { title: 'Sources', body };
+};

package/dist/vdom.d.ts

@@ -1,5 +1,6 @@
-import { toVNode } from 'snabbdom';
+import { type VNode, toVNode } from 'snabbdom';
 export type { VNode } from 'snabbdom';
 export { toVNode };
-export declare const patch: (oldVnode: import("snabbdom").VNode | Element | DocumentFragment, vnode: import("snabbdom").VNode) => import("snabbdom").VNode;
+export declare const patch: (oldVnode: VNode | Element | DocumentFragment, vnode: VNode) => VNode;
+export declare const dedupeSharedVNodes: (root: VNode) => VNode;
 //# sourceMappingURL=vdom.d.ts.map

package/dist/vdom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vdom.d.ts","sourceRoot":"","sources":["../src/vdom.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,OAAO,EACR,MAAM,UAAU,CAAA;AAIjB,YAAY,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,CAAA;AAElB,eAAO,MAAM,KAAK,gIAOhB,CAAA"}
+{"version":3,"file":"vdom.d.ts","sourceRoot":"","sources":["../src/vdom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,KAAK,EAOV,OAAO,EACR,MAAM,UAAU,CAAA;AAIjB,YAAY,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,CAAA;AAElB,eAAO,MAAM,KAAK,uEAOhB,CAAA;AAeF,eAAO,MAAM,kBAAkB,GAAI,MAAM,KAAK,KAAG,KA8BhD,CAAA"}

package/dist/vdom.js

@@ -9,3 +9,47 @@ export const patch = init([
     propsModule,
     styleModule,
 ]);
+// NOTE: snabbdom records each element's live DOM node on `vnode.elm` by
+// mutating the vnode object during patch. A vnode object placed in more than
+// one tree position would share a single `.elm`, so removals and text updates
+// land on the wrong DOM node. View code legitimately reuses vnode values, e.g.
+// `const checkmark = h.span(...)` dropped into several slots, so before each
+// patch we clone any vnode object reached a second time, giving every position
+// its own object.
+// Detection is keyed off a per-patch Set, so a vnode reused across renders (a
+// memoized `createLazy` subtree, the identical object each render) is reached
+// only once per patch and passes through untouched, leaving snabbdom's
+// same-object subtree short-circuit intact. Allocation happens only along
+// paths where a duplicate is actually found; a tree with no reuse returns
+// unchanged.
+export const dedupeSharedVNodes = (root) => {
+    const seen = new Set();
+    const visit = (node) => {
+        const base = seen.has(node) ? { ...node, elm: undefined } : node;
+        seen.add(base);
+        const children = base.children;
+        if (children === undefined) {
+            return base;
+        }
+        let nextChildren;
+        for (let index = 0; index < children.length; index++) {
+            const child = children[index];
+            const deduped = typeof child === 'string' ? child : visit(child);
+            if (deduped !== child) {
+                if (nextChildren === undefined) {
+                    nextChildren = children.slice();
+                }
+                nextChildren[index] = deduped;
+            }
+        }
+        if (nextChildren === undefined) {
+            return base;
+        }
+        if (base === node) {
+            return { ...node, children: nextChildren };
+        }
+        base.children = nextChildren;
+        return base;
+    };
+    return visit(root);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foldkit",
-  "version": "0.102.0",
+  "version": "0.103.0",
   "description": "A TypeScript frontend framework, built on Effect and architected like Elm",
   "type": "module",
   "main": "./dist/index.js",