@logixjs/react 0.1.1 → 1.0.0

package/dist/index.cjs

@@ -58,7 +58,7 @@ var RuntimeContext = (0, import_react.createContext)(null);
 
 // src/internal/provider/config.ts
 var import_effect = require("effect");
-var ReactRuntimeConfigTag = class extends import_effect.Context.Tag("@logixjs/react/RuntimeConfig")() {
+var ReactRuntimeConfigTag = class extends import_effect.ServiceMap.Service()("@logixjs/react/RuntimeConfig") {
 };
 var DEFAULT_CONFIG = {
   gcTime: 500,
@@ -168,13 +168,13 @@ var ReactRuntimeConfigSnapshot = {
   })
 };
 
+// src/internal/provider/env.ts
+var import_Env = require("@logixjs/core/Env");
+
 // src/internal/provider/fallback.tsx
 var import_react2 = require("react");
 var Logix = __toESM(require("@logixjs/core"), 1);
 
-// src/internal/provider/env.ts
-var import_Env = require("@logixjs/core/Env");
-
 // src/internal/provider/docs.ts
 var LOGIX_DOCS_PREFIX_ENV = "LOGIX_DOCS_PREFIX";
 var stripTrailingSlashes = (value) => value.replace(/\/+$/, "");
@@ -435,14 +435,11 @@ var useLayerBinding = (runtime, layer, enabled, onError) => {
     const newScope = import_effect2.Effect.runSync(import_effect2.Scope.make());
     const buildEffect = import_effect2.Effect.gen(function* () {
       const context = yield* import_effect2.Layer.buildWithScope(layer, newScope);
-      const applyEnv = (effect) => import_effect2.Effect.mapInputContext(
-        import_effect2.Scope.extend(effect, newScope),
-        (parent) => import_effect2.Context.merge(parent, context)
-      );
-      const loggers = yield* applyEnv(import_effect2.FiberRef.get(import_effect2.FiberRef.currentLoggers));
-      const logLevel = yield* applyEnv(import_effect2.FiberRef.get(import_effect2.FiberRef.currentLogLevel));
+      const applyEnv = (effect) => import_effect2.Scope.provide(newScope)(import_effect2.Effect.provideServices(effect, context));
+      const loggers = yield* applyEnv(import_effect2.Effect.service(import_effect2.Logger.CurrentLoggers)).pipe(import_effect2.Effect.orDie);
+      const logLevel = yield* applyEnv(import_effect2.Effect.service(import_effect2.References.MinimumLogLevel)).pipe(import_effect2.Effect.orDie);
       const debugSinks = yield* applyEnv(
-        import_effect2.FiberRef.get(Logix2.Debug.internal.currentDebugSinks)
+        import_effect2.Effect.service(Logix2.Debug.internal.currentDebugSinks).pipe(import_effect2.Effect.orDie)
       );
       return { context, loggers, logLevel, debugSinks };
     });
@@ -487,7 +484,7 @@ var useLayerBinding = (runtime, layer, enabled, onError) => {
           const cause = import_effect2.Cause.die(error);
           runtime.runFork(
             onError(cause, { source: "provider", phase: "provider.layer.build" }).pipe(
-              import_effect2.Effect.catchAllCause(() => import_effect2.Effect.void)
+              import_effect2.Effect.catchCause(() => import_effect2.Effect.void)
             )
           );
         }
@@ -525,18 +522,11 @@ var createRuntimeAdapter = (runtime, contexts, scopes, loggerSets, logLevels, de
   if (contexts.length === 0 && scopes.length === 0 && loggerSets.length === 0 && logLevels.length === 0 && debugSinks.length === 0) {
     return runtime;
   }
-  const applyContexts = (effect) => (
-    // First inherit Provider scopes via scope.extend (preserving FiberRef/Logger changes),
-    // then merge Context via mapInputContext (inner overrides outer).
-    contexts.reduceRight(
-      (acc, ctx) => import_effect2.Effect.mapInputContext(
-        acc,
-        (parent) => import_effect2.Context.merge(parent, ctx)
-      ),
-      scopes.reduceRight(
-        (acc, scope) => import_effect2.Scope.extend(acc, scope),
-        effect
-      )
+  const applyContexts = (effect) => contexts.reduceRight(
+    (acc, ctx) => import_effect2.Effect.provideServices(acc, ctx),
+    scopes.reduceRight(
+      (acc, scope) => import_effect2.Scope.provide(scope)(acc),
+      effect
     )
   );
   const applyLoggers = (effect) => {
@@ -545,16 +535,13 @@ var createRuntimeAdapter = (runtime, contexts, scopes, loggerSets, logLevels, de
     const sinks = debugSinks.length > 0 ? debugSinks[debugSinks.length - 1] : null;
     let result = effect;
     if (last) {
-      result = import_effect2.Effect.locally(import_effect2.FiberRef.currentLoggers, last)(result);
+      result = import_effect2.Effect.provideService(result, import_effect2.Logger.CurrentLoggers, last);
     }
     if (logLevel) {
-      result = import_effect2.Effect.locally(import_effect2.FiberRef.currentLogLevel, logLevel)(result);
+      result = import_effect2.Effect.provideService(result, import_effect2.References.MinimumLogLevel, logLevel);
     }
     if (sinks && sinks.length > 0) {
-      result = import_effect2.Effect.locally(
-        Logix2.Debug.internal.currentDebugSinks,
-        sinks
-      )(result);
+      result = import_effect2.Effect.provideService(result, Logix2.Debug.internal.currentDebugSinks, sinks);
     }
     return result;
   };
@@ -685,9 +672,9 @@ ${message}`;
   console.debug(label, message);
 };
 var causeToUnknown = (cause) => {
-  const failure = import_effect4.Option.getOrUndefined(import_effect4.Cause.failureOption(cause));
+  const failure = import_effect4.Option.getOrUndefined(import_effect4.Cause.findErrorOption(cause));
   if (failure !== void 0) return failure;
-  const defect = import_effect4.Option.getOrUndefined(import_effect4.Cause.dieOption(cause));
+  const defect = cause.reasons.filter(import_effect4.Cause.isDieReason).map((reason) => reason.defect)[0];
   if (defect !== void 0) return defect;
   return cause;
 };
@@ -696,7 +683,7 @@ var yieldEffect = (strategy) => {
     case "none":
       return import_effect4.Effect.void;
     case "microtask":
-      return import_effect4.Effect.yieldNow();
+      return import_effect4.Effect.yieldNow;
     case "macrotask":
       return import_effect4.Effect.promise(
         () => new Promise((resolve) => {
@@ -789,6 +776,67 @@ var ModuleCache = class {
     const scope = import_effect4.Effect.runSync(import_effect4.Scope.make());
     const workloadKey = `${options?.entrypoint ?? "unknown"}::${ownerId ?? "unknown"}`;
     const yieldDecision = decideYieldStrategy(this.runtime, workloadKey, options?.yield);
+    const optimisticSyncBudgetMs = options?.optimisticSyncBudgetMs ?? 0;
+    const shouldTryOptimisticSync = options?.policyMode === "suspend" && optimisticSyncBudgetMs > 0;
+    if (shouldTryOptimisticSync) {
+      const startedAt2 = performance.now();
+      try {
+        const value = this.runtime.runSync(factory(scope));
+        const durationMs = performance.now() - startedAt2;
+        YieldBudgetMemory.record({ runtime: this.runtime, workloadKey, durationMs });
+        const entry2 = {
+          scope,
+          status: "success",
+          promise: Promise.resolve(value),
+          value,
+          refCount: 0,
+          preloadRefCount: 0,
+          gcTime: gcTime ?? this.gcDelayMs,
+          ownerId,
+          createdBy: "read",
+          workloadKey,
+          yieldStrategy: "none"
+        };
+        this.scheduleGC(key, entry2);
+        this.entries.set(key, entry2);
+        if ((0, import_Env.isDevEnv)() || Logix4.Debug.isDevtoolsEnabled()) {
+          void this.runtime.runPromise(
+            Logix4.Debug.record({
+              type: "trace:react.module.init",
+              moduleId: ownerId,
+              instanceId: value.instanceId,
+              data: {
+                mode: "suspend",
+                key,
+                durationMs: Math.round(durationMs * 100) / 100,
+                yieldStrategy: "none",
+                fastPath: "sync"
+              }
+            })
+          ).catch((error) => {
+            debugBestEffortFailure("[ModuleCache] Debug.record failed", error);
+          });
+          void this.runtime.runPromise(
+            Logix4.Debug.record({
+              type: "trace:react.module-instance",
+              moduleId: ownerId,
+              instanceId: value.instanceId,
+              data: {
+                event: "attach",
+                key,
+                mode: "suspend",
+                gcTime: entry2.gcTime,
+                fastPath: "sync"
+              }
+            })
+          ).catch((error) => {
+            debugBestEffortFailure("[ModuleCache] Debug.record failed", error);
+          });
+        }
+        return value;
+      } catch {
+      }
+    }
     const entry = {
       scope,
       status: "pending",
@@ -804,7 +852,7 @@ var ModuleCache = class {
     };
     this.scheduleGC(key, entry);
     const startedAt = performance.now();
-    const buildEffect = yieldEffect(yieldDecision.strategy).pipe(import_effect4.Effect.zipRight(factory(scope)));
+    const buildEffect = yieldEffect(yieldDecision.strategy).pipe(import_effect4.Effect.flatMap(() => factory(scope)));
     const fiber = this.runtime.runFork(buildEffect);
     entry.fiber = fiber;
     const promise = this.runtime.runPromise(import_effect4.Fiber.await(fiber)).then((exit) => {
@@ -1000,6 +1048,49 @@ var ModuleCache = class {
       throw error;
     }
   }
+  warmSync(key, factory, gcTime, ownerId, options) {
+    const existing = this.entries.get(key);
+    if (existing) {
+      if ((0, import_Env.isDevEnv)() && existing.ownerId !== void 0 && ownerId !== void 0 && existing.ownerId !== ownerId) {
+        throw new Error(
+          `[ModuleCache.warmSync] resource key "${key}" has already been claimed by module "${existing.ownerId}", but is now requested by module "${ownerId}".`
+        );
+      }
+      if (existing.status === "success") {
+        return existing.value;
+      }
+      return void 0;
+    }
+    const scope = this.runtime.runSync(import_effect4.Scope.make());
+    const startedAt = performance.now();
+    const workloadKey = `${options?.entrypoint ?? "unknown"}::${ownerId ?? "unknown"}`;
+    try {
+      const value = this.runtime.runSync(factory(scope));
+      const durationMs = performance.now() - startedAt;
+      YieldBudgetMemory.record({ runtime: this.runtime, workloadKey, durationMs });
+      const entry = {
+        scope,
+        status: "success",
+        promise: Promise.resolve(value),
+        value,
+        refCount: 0,
+        preloadRefCount: 0,
+        gcTime: gcTime ?? this.gcDelayMs,
+        ownerId,
+        createdBy: "preload",
+        workloadKey,
+        yieldStrategy: "none"
+      };
+      this.scheduleGC(key, entry);
+      this.entries.set(key, entry);
+      return value;
+    } catch (error) {
+      void this.runtime.runPromise(import_effect4.Scope.close(scope, import_effect4.Exit.fail(error))).catch((closeError) => {
+        debugBestEffortFailure("[ModuleCache] Scope.close failed", closeError);
+      });
+      return void 0;
+    }
+  }
   preload(key, factory, options) {
     const existing = this.entries.get(key);
     if (existing) {
@@ -1029,6 +1120,38 @@ var ModuleCache = class {
     const gcTime = options?.gcTime ?? this.gcDelayMs;
     const workloadKey = `${options?.entrypoint ?? "unknown"}::${ownerId ?? "unknown"}`;
     const yieldDecision = decideYieldStrategy(this.runtime, workloadKey, options?.yield);
+    const optimisticSyncBudgetMs = options?.optimisticSyncBudgetMs ?? 0;
+    const shouldTryOptimisticSync = options?.policyMode === "defer" && optimisticSyncBudgetMs > 0;
+    if (shouldTryOptimisticSync) {
+      const startedAt2 = performance.now();
+      try {
+        const value = this.runtime.runSync(factory(scope));
+        const durationMs = performance.now() - startedAt2;
+        YieldBudgetMemory.record({ runtime: this.runtime, workloadKey, durationMs });
+        const entry2 = {
+          scope,
+          status: "success",
+          promise: Promise.resolve(value),
+          value,
+          refCount: 0,
+          preloadRefCount: 1,
+          gcTime,
+          ownerId,
+          createdBy: "preload",
+          workloadKey,
+          yieldStrategy: "none"
+        };
+        this.scheduleGC(key, entry2);
+        this.entries.set(key, entry2);
+        return {
+          promise: Promise.resolve(value),
+          cancel: () => {
+            this.cancelPreload(key, entry2);
+          }
+        };
+      } catch {
+      }
+    }
     const entry = {
       scope,
       status: "pending",
@@ -1044,7 +1167,7 @@ var ModuleCache = class {
     this.scheduleGC(key, entry);
     this.entries.set(key, entry);
     const startedAt = performance.now();
-    const buildEffect = yieldEffect(yieldDecision.strategy).pipe(import_effect4.Effect.zipRight(factory(scope)));
+    const buildEffect = yieldEffect(yieldDecision.strategy).pipe(import_effect4.Effect.flatMap(() => factory(scope)));
     const fiber = this.runtime.runFork(buildEffect);
     entry.fiber = fiber;
     const promise = this.runtime.runPromise(import_effect4.Fiber.await(fiber)).then((exit) => {
@@ -1283,6 +1406,9 @@ var RuntimeProvider = ({
 }) => {
   const parent = (0, import_react4.useContext)(RuntimeContext);
   const baseRuntime = useRuntimeResolution(runtime, parent);
+  const providerStartedAtRef = import_react4.default.useRef(performance.now());
+  const providerReadyAtRef = import_react4.default.useRef(void 0);
+  const didReportProviderGatingRef = import_react4.default.useRef(false);
   const resolvedPolicy = (0, import_react4.useMemo)(
     () => resolveRuntimeProviderPolicy({
       policy,
@@ -1322,7 +1448,7 @@ var RuntimeProvider = ({
             moduleId: event.moduleId,
             instanceId: event.instanceId,
             runtimeLabel: event.runtimeLabel
-          }).pipe(import_effect5.Effect.catchAllCause(() => import_effect5.Effect.void));
+          }).pipe(import_effect5.Effect.catchCause(() => import_effect5.Effect.void));
         }
         if (event.type === "diagnostic" && event.severity === "error") {
           return handler(
@@ -1341,7 +1467,7 @@ var RuntimeProvider = ({
               instanceId: event.instanceId,
               runtimeLabel: event.runtimeLabel
             }
-          ).pipe(import_effect5.Effect.catchAllCause(() => import_effect5.Effect.void));
+          ).pipe(import_effect5.Effect.catchCause(() => import_effect5.Effect.void));
         }
         return import_effect5.Effect.void;
       }
@@ -1356,9 +1482,7 @@ var RuntimeProvider = ({
       return layerBinding.debugSinks;
     }
     try {
-      return baseRuntime.runSync(
-        import_effect5.FiberRef.get(Logix5.Debug.internal.currentDebugSinks)
-      );
+      return baseRuntime.runSync(import_effect5.Effect.service(Logix5.Debug.internal.currentDebugSinks).pipe(import_effect5.Effect.orDie));
     } catch {
       return [];
     }
@@ -1485,6 +1609,41 @@ var RuntimeProvider = ({
   const resolveFallback = (phase) => {
     return resolveRuntimeProviderFallback({ fallback, phase, policyMode: resolvedPolicy.mode });
   };
+  const preloadCache = (0, import_react4.useMemo)(
+    () => getModuleCache(runtimeWithBindings, configState.snapshot, configState.version),
+    [runtimeWithBindings, configState.snapshot, configState.version]
+  );
+  const syncWarmPreloadReady = (0, import_react4.useMemo)(() => {
+    if (resolvedPolicy.mode !== "defer") return false;
+    if (!resolvedPolicy.preload) return true;
+    if (!isLayerReady || !isConfigReady) return false;
+    const handles = resolvedPolicy.preload.handles;
+    if (handles.length === 0) return true;
+    for (const handle of handles) {
+      if (handle?._tag === "ModuleImpl") {
+        const moduleId = handle.module?.id ?? "ModuleImpl";
+        const key2 = resolvedPolicy.preload.keysByModuleId.get(moduleId) ?? getPreloadKeyForModuleId(moduleId);
+        const factory2 = (scope) => import_effect5.Layer.buildWithScope(handle.layer, scope).pipe(
+          import_effect5.Effect.map((context) => import_effect5.ServiceMap.get(context, handle.module))
+        );
+        const value2 = preloadCache.warmSync(key2, factory2, configState.snapshot.gcTime, moduleId, {
+          entrypoint: "react.runtime.preload.sync-warm",
+          policyMode: "defer"
+        });
+        if (!value2) return false;
+        continue;
+      }
+      const tagId = handle.id ?? "ModuleTag";
+      const key = resolvedPolicy.preload.keysByTagId.get(tagId) ?? getPreloadKeyForTagId(tagId);
+      const factory = (scope) => import_effect5.Scope.provide(scope)(import_effect5.Effect.service(handle).pipe(import_effect5.Effect.orDie));
+      const value = preloadCache.warmSync(key, factory, configState.snapshot.gcTime, tagId, {
+        entrypoint: "react.runtime.preload.sync-warm",
+        policyMode: "defer"
+      });
+      if (!value) return false;
+    }
+    return true;
+  }, [resolvedPolicy, isLayerReady, isConfigReady, preloadCache, configState.snapshot.gcTime]);
   const [deferReady, setDeferReady] = (0, import_react4.useState)(false);
   (0, import_react4.useEffect)(() => {
     if (resolvedPolicy.mode !== "defer") {
@@ -1498,6 +1657,10 @@ var RuntimeProvider = ({
     if (resolvedPolicy.mode !== "defer") {
       return;
     }
+    if (syncWarmPreloadReady) {
+      setDeferReady(true);
+      return;
+    }
     setDeferReady(false);
     if (!resolvedPolicy.preload) {
       setDeferReady(true);
@@ -1507,7 +1670,7 @@ var RuntimeProvider = ({
       return;
     }
     let cancelled = false;
-    const cache = getModuleCache(runtimeWithBindings, configState.snapshot, configState.version);
+    const cache = preloadCache;
     const preloadHandles = resolvedPolicy.preload.handles;
     if (preloadHandles.length === 0) {
       setDeferReady(true);
@@ -1525,13 +1688,14 @@ var RuntimeProvider = ({
           const moduleId = handle.module?.id ?? "ModuleImpl";
           const key2 = resolvedPolicy.preload.keysByModuleId.get(moduleId) ?? getPreloadKeyForModuleId(moduleId);
           const factory2 = (scope) => import_effect5.Layer.buildWithScope(handle.layer, scope).pipe(
-            import_effect5.Effect.map((context) => import_effect5.Context.get(context, handle.module))
+            import_effect5.Effect.map((context) => import_effect5.ServiceMap.get(context, handle.module))
           );
           const op2 = cache.preload(key2, factory2, {
             ownerId: moduleId,
             yield: resolvedPolicy.preload.yield,
             entrypoint: "react.runtime.preload",
-            policyMode: "defer"
+            policyMode: "defer",
+            optimisticSyncBudgetMs: resolvedPolicy.syncBudgetMs
           });
           allCancels.add(op2.cancel);
           await op2.promise;
@@ -1556,14 +1720,13 @@ var RuntimeProvider = ({
         }
         const tagId = handle.id ?? "ModuleTag";
         const key = resolvedPolicy.preload.keysByTagId.get(tagId) ?? getPreloadKeyForTagId(tagId);
-        const factory = (scope) => handle.pipe(
-          import_effect5.Scope.extend(scope)
-        );
+        const factory = (scope) => import_effect5.Scope.provide(scope)(import_effect5.Effect.service(handle).pipe(import_effect5.Effect.orDie));
         const op = cache.preload(key, factory, {
           ownerId: tagId,
           yield: resolvedPolicy.preload.yield,
           entrypoint: "react.runtime.preload",
-          policyMode: "defer"
+          policyMode: "defer",
+          optimisticSyncBudgetMs: resolvedPolicy.syncBudgetMs
         });
         allCancels.add(op.cancel);
         await op.promise;
@@ -1601,7 +1764,7 @@ var RuntimeProvider = ({
       if (cancelled) return;
       if (onErrorRef.current) {
         runtimeWithBindings.runFork(
-          onErrorRef.current(import_effect5.Cause.die(error), { source: "provider", phase: "provider.layer.build" }).pipe(import_effect5.Effect.catchAllCause(() => import_effect5.Effect.void))
+          onErrorRef.current(import_effect5.Cause.die(error), { source: "provider", phase: "provider.layer.build" }).pipe(import_effect5.Effect.catchCause(() => import_effect5.Effect.void))
         );
       }
       setDeferReady(true);
@@ -1634,13 +1797,54 @@ var RuntimeProvider = ({
       release();
     };
   }, [resolvedPolicy.mode, deferReady]);
-  const isReady = isTickServicesReady && isLayerReady && isConfigReady && (resolvedPolicy.mode !== "defer" || deferReady);
+  const isReady = isTickServicesReady && isLayerReady && isConfigReady && (resolvedPolicy.mode !== "defer" || deferReady || syncWarmPreloadReady);
+  if (isReady && providerReadyAtRef.current === void 0) {
+    providerReadyAtRef.current = performance.now();
+  }
+  (0, import_react4.useEffect)(() => {
+    if (!isReady) {
+      return;
+    }
+    if (didReportProviderGatingRef.current) {
+      return;
+    }
+    let diagnosticsLevel = "off";
+    try {
+      diagnosticsLevel = runtimeWithBindings.runSync(
+        import_effect5.Effect.service(Logix5.Debug.internal.currentDiagnosticsLevel).pipe(import_effect5.Effect.orDie)
+      );
+    } catch {
+      diagnosticsLevel = (0, import_Env.isDevEnv)() ? "light" : "off";
+    }
+    if (diagnosticsLevel === "off") {
+      return;
+    }
+    didReportProviderGatingRef.current = true;
+    const readyAt = providerReadyAtRef.current ?? performance.now();
+    const durationMs = Math.round((readyAt - providerStartedAtRef.current) * 100) / 100;
+    const effectDelayMs = Math.round((performance.now() - readyAt) * 100) / 100;
+    void runtimeWithBindings.runPromise(
+      Logix5.Debug.record({
+        type: "trace:react.provider.gating",
+        data: {
+          event: "ready",
+          policyMode: resolvedPolicy.mode,
+          durationMs,
+          effectDelayMs,
+          configLoadMode: configState.loadMode,
+          syncOverBudget: Boolean(configState.syncOverBudget),
+          syncDurationMs: configState.syncDurationMs !== void 0 ? Math.round(configState.syncDurationMs * 100) / 100 : void 0
+        }
+      })
+    ).catch(() => {
+    });
+  }, [configState.loadMode, configState.syncDurationMs, configState.syncOverBudget, isReady, resolvedPolicy.mode, runtimeWithBindings]);
   if (!isReady) {
     const blockersList = [
       isTickServicesReady ? null : "tick",
       isLayerReady ? null : "layer",
       isConfigReady ? null : "config",
-      resolvedPolicy.mode !== "defer" || deferReady ? null : "preload"
+      resolvedPolicy.mode !== "defer" || deferReady || syncWarmPreloadReady ? null : "preload"
     ].filter((x) => x !== null);
     const blockers = blockersList.length > 0 ? blockersList.join("+") : void 0;
     return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
@@ -1753,13 +1957,13 @@ function useRuntime(options) {
 
 // src/internal/hooks/useModule.ts
 var import_react9 = __toESM(require("react"), 1);
-var Logix10 = __toESM(require("@logixjs/core"), 1);
-var import_effect9 = require("effect");
+var Logix11 = __toESM(require("@logixjs/core"), 1);
+var import_effect10 = require("effect");
 
 // src/internal/hooks/useModuleRuntime.ts
 var import_react6 = require("react");
-var Logix6 = __toESM(require("@logixjs/core"), 1);
-var import_effect7 = require("effect");
+var Logix7 = __toESM(require("@logixjs/core"), 1);
+var import_effect8 = require("effect");
 
 // src/internal/store/ModuleRef.ts
 var isModuleRef = (value) => typeof value === "object" && value !== null && "runtime" in value && "actions" in value && "dispatch" in value;
@@ -1850,11 +2054,26 @@ var applyHandleExtend = (tag, runtime, base) => {
   return { ...base, ...next };
 };
 
+// src/internal/provider/runtimeDebugBridge.ts
+var import_effect7 = require("effect");
+var Logix6 = __toESM(require("@logixjs/core"), 1);
+var readRuntimeDiagnosticsLevel = (runtime) => {
+  try {
+    return runtime.runSync(import_effect7.Effect.service(Logix6.Debug.internal.currentDiagnosticsLevel).pipe(import_effect7.Effect.orDie));
+  } catch {
+    return (0, import_Env.isDevEnv)() ? "light" : "off";
+  }
+};
+var emitRuntimeDebugEventBestEffort = (runtime, event) => {
+  runtime.runFork(event);
+};
+
 // src/internal/hooks/useModuleRuntime.ts
 var isModuleRuntime = (value) => typeof value === "object" && value !== null && "dispatch" in value && "getState" in value;
 function useModuleRuntime(handle) {
   const runtime = useRuntime();
   const runtimeContext = (0, import_react6.useContext)(RuntimeContext);
+  const moduleTagResolveTraceRef = (0, import_react6.useRef)(void 0);
   if (!runtimeContext) {
     throw new RuntimeProviderNotFoundError("useModuleRuntime");
   }
@@ -1875,36 +2094,48 @@ function useModuleRuntime(handle) {
     const preloadKey = runtimeContext.policy.preload?.keysByTagId.get(tokenId);
     const key = preloadKey ?? `tag:${tokenId}`;
     const mode = runtimeContext.policy.moduleTagMode;
-    const factory = (scope) => tag.pipe(import_effect7.Scope.extend(scope));
-    return mode === "suspend" ? cache.read(key, factory, void 0, tokenId, {
+    const startedAtMs = performance.now();
+    const factory = (scope) => import_effect8.Scope.provide(scope)(import_effect8.Effect.service(tag).pipe(import_effect8.Effect.orDie));
+    const resolvedRuntime = mode === "suspend" ? cache.read(key, factory, void 0, tokenId, {
       entrypoint: "react.useModuleRuntime",
       policyMode: runtimeContext.policy.mode,
-      yield: runtimeContext.policy.yield
+      yield: runtimeContext.policy.yield,
+      optimisticSyncBudgetMs: runtimeContext.policy.syncBudgetMs
     }) : cache.readSync(key, factory, void 0, tokenId, {
       entrypoint: "react.useModuleRuntime",
       policyMode: runtimeContext.policy.mode,
       warnSyncBlockingThresholdMs: 5
     });
+    moduleTagResolveTraceRef.current = {
+      tokenId,
+      durationMs: Math.round((performance.now() - startedAtMs) * 100) / 100,
+      cacheMode: mode
+    };
+    return resolvedRuntime;
   }, [cache, runtimeContext.policy, handle]);
   (0, import_react6.useEffect)(() => {
     if (!isTagHandle) {
       return;
     }
-    if (!(0, import_Env.isDevEnv)() && !Logix6.Debug.isDevtoolsEnabled()) {
+    const diagnosticsLevel = readRuntimeDiagnosticsLevel(runtime);
+    if (diagnosticsLevel === "off") {
       return;
     }
     const tokenId = handle?.id ?? "ModuleTag";
-    const effect = Logix6.Debug.record({
+    const trace = moduleTagResolveTraceRef.current;
+    const effect = Logix7.Debug.record({
       type: "trace:react.moduleTag.resolve",
       moduleId: resolved.moduleId,
       instanceId: resolved.instanceId,
       data: {
         mode: runtimeContext.policy.moduleTagMode,
         tokenId,
-        yieldStrategy: runtimeContext.policy.yield.strategy
+        yieldStrategy: runtimeContext.policy.yield.strategy,
+        durationMs: trace?.durationMs,
+        cacheMode: trace?.cacheMode ?? runtimeContext.policy.moduleTagMode
       }
     });
-    runtime.runFork(effect);
+    emitRuntimeDebugEventBestEffort(runtime, effect);
   }, [runtime, runtimeContext.policy, resolved, handle, isTagHandle]);
   return resolved;
 }
@@ -1912,11 +2143,11 @@ function useModuleRuntime(handle) {
 // src/internal/hooks/useSelector.ts
 var import_react7 = require("react");
 var import_with_selector = require("use-sync-external-store/shim/with-selector");
-var Logix8 = __toESM(require("@logixjs/core"), 1);
+var Logix9 = __toESM(require("@logixjs/core"), 1);
 
 // src/internal/store/RuntimeExternalStore.ts
-var Logix7 = __toESM(require("@logixjs/core"), 1);
-var import_effect8 = require("effect");
+var Logix8 = __toESM(require("@logixjs/core"), 1);
+var import_effect9 = require("effect");
 var storesByRuntime = /* @__PURE__ */ new WeakMap();
 var getStoreMapForRuntime = (runtime) => {
   const cached = storesByRuntime.get(runtime);
@@ -1927,8 +2158,8 @@ var getStoreMapForRuntime = (runtime) => {
 };
 var makeModuleInstanceKey = (moduleId, instanceId) => `${moduleId}::${instanceId}`;
 var makeReadQueryTopicKey = (moduleInstanceKey, selectorId) => `${moduleInstanceKey}::rq:${selectorId}`;
-var getRuntimeStore = (runtime) => Logix7.InternalContracts.getRuntimeStore(runtime);
-var getHostScheduler = (runtime) => Logix7.InternalContracts.getHostScheduler(runtime);
+var getRuntimeStore = (runtime) => Logix8.InternalContracts.getRuntimeStore(runtime);
+var getHostScheduler = (runtime) => Logix8.InternalContracts.getHostScheduler(runtime);
 var getOrCreateStore = (runtime, topicKey, make) => {
   const map = getStoreMapForRuntime(runtime);
   const cached = map.get(topicKey);
@@ -1952,6 +2183,8 @@ var makeTopicExternalStore = (args) => {
   let currentSnapshot;
   const listeners = /* @__PURE__ */ new Set();
   let unsubscribeFromRuntimeStore;
+  let teardownScheduled = false;
+  let teardownToken = 0;
   const lowPriorityDelayMs = args.options?.lowPriorityDelayMs ?? 16;
   const lowPriorityMaxDelayMs = args.options?.lowPriorityMaxDelayMs ?? 50;
   let notifyScheduled = false;
@@ -2036,7 +2269,38 @@ var makeTopicExternalStore = (args) => {
     currentSnapshot = next;
     return next;
   };
+  const cancelScheduledTeardown = () => {
+    if (!teardownScheduled) return;
+    teardownScheduled = false;
+    teardownToken += 1;
+  };
+  const finalizeTeardown = () => {
+    if (listeners.size > 0) return;
+    try {
+      args.onLastListener?.();
+    } catch {
+    }
+    const unsub = unsubscribeFromRuntimeStore;
+    unsubscribeFromRuntimeStore = void 0;
+    cancelLow();
+    try {
+      unsub?.();
+    } catch {
+    }
+    removeStore(runtime, topicKey);
+  };
+  const scheduleTeardown = () => {
+    if (teardownScheduled) return;
+    teardownScheduled = true;
+    const token = ++teardownToken;
+    hostScheduler.scheduleMicrotask(() => {
+      if (!teardownScheduled || token !== teardownToken) return;
+      teardownScheduled = false;
+      finalizeTeardown();
+    });
+  };
   const subscribe = (listener) => {
+    cancelScheduledTeardown();
     const isFirst = listeners.size === 0;
     listeners.add(listener);
     ensureSubscription();
@@ -2050,18 +2314,7 @@ var makeTopicExternalStore = (args) => {
     return () => {
       listeners.delete(listener);
       if (listeners.size > 0) return;
-      try {
-        args.onLastListener?.();
-      } catch {
-      }
-      const unsub = unsubscribeFromRuntimeStore;
-      unsubscribeFromRuntimeStore = void 0;
-      cancelLow();
-      try {
-        unsub?.();
-      } catch {
-      }
-      removeStore(runtime, topicKey);
+      scheduleTeardown();
     };
   };
   return { getSnapshot, getServerSnapshot: getSnapshot, subscribe };
@@ -2105,14 +2358,14 @@ var getRuntimeReadQueryExternalStore = (runtime, moduleRuntime, selectorReadQuer
       options,
       onFirstListener: () => {
         if (readQueryDrainFiber) return;
-        const effect = import_effect8.Stream.runDrain(moduleRuntime.changesReadQueryWithMeta(selectorReadQuery));
+        const effect = import_effect9.Stream.runDrain(moduleRuntime.changesReadQueryWithMeta(selectorReadQuery));
         readQueryDrainFiber = runtime.runFork(effect);
       },
       onLastListener: () => {
         const fiber = readQueryDrainFiber;
         if (!fiber) return;
         readQueryDrainFiber = void 0;
-        runtime.runFork(import_effect8.Fiber.interrupt(fiber));
+        runtime.runFork(import_effect9.Fiber.interrupt(fiber));
       }
     })
   );
@@ -2178,7 +2431,7 @@ function useSelector(handle, selector, equalityFn) {
   const moduleRuntime = useModuleRuntime(handle);
   const actualSelector = selector ?? ((state) => state);
   const selectorReadQuery = (0, import_react7.useMemo)(
-    () => typeof selector === "function" ? Logix8.ReadQuery.compile(selector) : void 0,
+    () => typeof selector === "function" ? Logix9.ReadQuery.compile(selector) : void 0,
     [selector]
   );
   const actualEqualityFn = (0, import_react7.useMemo)(() => {
@@ -2216,7 +2469,7 @@ function useSelector(handle, selector, equalityFn) {
     actualEqualityFn
   );
   (0, import_react7.useEffect)(() => {
-    if (!(0, import_Env.isDevEnv)() && !Logix8.Debug.isDevtoolsEnabled()) {
+    if (!(0, import_Env.isDevEnv)() && !Logix9.Debug.isDevtoolsEnabled()) {
       return;
     }
     const instanceId = moduleRuntime.instanceId;
@@ -2232,7 +2485,7 @@ function useSelector(handle, selector, equalityFn) {
       const rawDebugKey = meta.debugKey;
       selectorKey = typeof rawDebugKey === "string" && rawDebugKey.length > 0 ? rawDebugKey : typeof selector.name === "string" && selector.name.length > 0 ? selector.name : void 0;
     }
-    const effect = Logix8.Debug.record({
+    const effect = Logix9.Debug.record({
       type: "trace:react-selector",
       moduleId: moduleRuntime.moduleId,
       instanceId,
@@ -2255,7 +2508,7 @@ function useSelector(handle, selector, equalityFn) {
 }
 
 // src/internal/store/resolveImportedModuleRef.ts
-var Logix9 = __toESM(require("@logixjs/core"), 1);
+var Logix10 = __toESM(require("@logixjs/core"), 1);
 var getOrCreateWeakMap = (map, key, make) => {
   const cached = map.get(key);
   if (cached) return cached;
@@ -2279,7 +2532,7 @@ var resolveImportedModuleRef = (runtime, parentRuntime, module2) => {
   if (cached) {
     return cached;
   }
-  const importsScope = Logix9.InternalContracts.getImportsScope(parentRuntime);
+  const importsScope = Logix10.InternalContracts.getImportsScope(parentRuntime);
   const childRuntime = importsScope.get(module2);
   if (childRuntime) {
     const dispatch = Object.assign(
@@ -2365,8 +2618,8 @@ var useStableId = () => {
 
 // src/internal/hooks/useModule.ts
 var isModuleImpl2 = (handle) => Boolean(handle) && typeof handle === "object" && handle._tag === "ModuleImpl";
-var isModule = (handle) => Logix10.Module.hasImpl(handle);
-var isModuleDef = (handle) => Logix10.Module.is(handle) && handle._kind === "ModuleDef";
+var isModule = (handle) => Logix11.Module.hasImpl(handle);
+var isModuleDef = (handle) => Logix11.Module.is(handle) && handle._kind === "ModuleDef";
 function useModule(handle, selectorOrOptions, equalityFn) {
   const runtimeBase = useRuntime();
   const runtimeContext = import_react9.default.useContext(RuntimeContext);
@@ -2390,6 +2643,7 @@ function useModule(handle, selectorOrOptions, equalityFn) {
     }
   }
   let runtime;
+  const moduleImplResolveTraceRef = import_react9.default.useRef(void 0);
   if (isModuleImpl2(normalizedHandle)) {
     const cache = import_react9.default.useMemo(
       () => getModuleCache(runtimeBase, runtimeContext.reactConfigSnapshot, runtimeContext.configVersion),
@@ -2418,9 +2672,9 @@ function useModule(handle, selectorOrOptions, equalityFn) {
     const key = depsHash ? `${baseKey}:${depsHash}` : baseKey;
     const ownerId = moduleId;
     const baseFactory = import_react9.default.useMemo(
-      () => (scope) => import_effect9.Layer.buildWithScope(normalizedHandle.layer, scope).pipe(
-        import_effect9.Effect.map(
-          (context) => import_effect9.Context.get(context, normalizedHandle.module)
+      () => (scope) => import_effect10.Layer.buildWithScope(import_effect10.Layer.fresh(normalizedHandle.layer), scope).pipe(
+        import_effect10.Effect.map(
+          (context) => import_effect10.ServiceMap.get(context, normalizedHandle.module)
         )
       ),
       [normalizedHandle]
@@ -2430,26 +2684,56 @@ function useModule(handle, selectorOrOptions, equalityFn) {
         return baseFactory;
       }
       return (scope) => baseFactory(scope).pipe(
-        import_effect9.Effect.timeoutFail({
-          duration: initTimeoutMs,
-          onTimeout: () => new Error(`[useModule] Module "${ownerId}" initialization timed out after ${initTimeoutMs}ms`)
-        })
+        import_effect10.Effect.timeoutOption(initTimeoutMs),
+        import_effect10.Effect.flatMap(
+          (maybe) => maybe._tag === "Some" ? import_effect10.Effect.succeed(maybe.value) : import_effect10.Effect.die(new Error(`[useModule] Module "${ownerId}" initialization timed out after ${initTimeoutMs}ms`))
+        )
       );
     }, [baseFactory, suspend, initTimeoutMs, ownerId]);
+    const moduleResolveStartedAt = performance.now();
     const moduleRuntime = suspend ? cache.read(key, factory, gcTime, ownerId, {
       entrypoint: "react.useModule",
       policyMode: runtimeContext.policy.mode,
-      yield: runtimeContext.policy.yield
+      yield: runtimeContext.policy.yield,
+      optimisticSyncBudgetMs: runtimeContext.policy.syncBudgetMs
     }) : cache.readSync(key, factory, gcTime, ownerId, {
       entrypoint: "react.useModule",
       policyMode: runtimeContext.policy.mode,
       warnSyncBlockingThresholdMs: 5
     });
+    moduleImplResolveTraceRef.current = {
+      moduleId,
+      cacheMode: suspend ? "suspend" : "sync",
+      durationMs: Math.round((performance.now() - moduleResolveStartedAt) * 100) / 100
+    };
     import_react9.default.useEffect(() => cache.retain(key), [cache, key]);
     runtime = moduleRuntime;
   } else {
     runtime = useModuleRuntime(normalizedHandle);
   }
+  import_react9.default.useEffect(() => {
+    if (!isModuleImpl2(normalizedHandle)) {
+      return;
+    }
+    const diagnosticsLevel = readRuntimeDiagnosticsLevel(runtimeBase);
+    if (diagnosticsLevel === "off") {
+      return;
+    }
+    const trace = moduleImplResolveTraceRef.current;
+    if (!trace) {
+      return;
+    }
+    const effect = Logix11.Debug.record({
+      type: "trace:react.moduleImpl.resolve",
+      moduleId: trace.moduleId,
+      instanceId: runtime.instanceId,
+      data: {
+        cacheMode: trace.cacheMode,
+        durationMs: trace.durationMs
+      }
+    });
+    emitRuntimeDebugEventBestEffort(runtimeBase, effect);
+  }, [runtimeBase, runtime, normalizedHandle]);
   import_react9.default.useEffect(() => {
     if (!isModuleImpl2(normalizedHandle)) {
       return;
@@ -2459,22 +2743,22 @@ function useModule(handle, selectorOrOptions, equalityFn) {
     if (!label) {
       return;
     }
-    const effect = Logix10.Debug.record({
+    const effect = Logix11.Debug.record({
       type: "trace:instanceLabel",
       moduleId: normalizedHandle.module.id,
       instanceId: runtime.instanceId,
       data: { label }
     });
-    runtimeBase.runFork(effect);
+    emitRuntimeDebugEventBestEffort(runtimeBase, effect);
   }, [runtimeBase, runtime, normalizedHandle, options]);
   import_react9.default.useEffect(() => {
-    if (!(0, import_Env.isDevEnv)() && !Logix10.Debug.isDevtoolsEnabled()) {
+    if (!(0, import_Env.isDevEnv)() && !Logix11.Debug.isDevtoolsEnabled()) {
       return;
     }
     if (!runtime.instanceId) {
       return;
     }
-    const effect = Logix10.Debug.record({
+    const effect = Logix11.Debug.record({
       type: "trace:react-render",
       moduleId: runtime.moduleId,
       instanceId: runtime.instanceId,
@@ -2484,7 +2768,7 @@ function useModule(handle, selectorOrOptions, equalityFn) {
       }
     });
     runtimeBase.runFork(effect);
-  }, [runtimeBase, runtime]);
+  });
   if (selector) {
     if (isModuleImpl2(normalizedHandle)) {
       return useSelector(runtime, selector, equalityFn);
@@ -2571,8 +2855,8 @@ function useModule(handle, selectorOrOptions, equalityFn) {
 
 // src/internal/hooks/useLocalModule.ts
 var import_react10 = __toESM(require("react"), 1);
-var Logix11 = __toESM(require("@logixjs/core"), 1);
-var import_effect10 = require("effect");
+var Logix12 = __toESM(require("@logixjs/core"), 1);
+var import_effect11 = require("effect");
 function isModuleTag2(source) {
   if (!source || typeof source !== "object" && typeof source !== "function") {
     return false;
@@ -2592,7 +2876,7 @@ function useLocalModule(source, second) {
   );
   const componentId = useStableId();
   const moduleTag = import_react10.default.useMemo(() => {
-    if (Logix11.Module.is(source)) {
+    if (Logix12.Module.is(source)) {
       return source.tag;
     }
     if (isModuleTag2(source)) {
@@ -2601,7 +2885,7 @@ function useLocalModule(source, second) {
     return null;
   }, [source]);
   const def = import_react10.default.useMemo(() => {
-    if (Logix11.Module.is(source) || isModuleTag2(source)) {
+    if (Logix12.Module.is(source) || isModuleTag2(source)) {
       return source;
     }
     return void 0;
@@ -2629,7 +2913,7 @@ function useLocalModule(source, second) {
       return createModuleTagFactory(moduleTag, moduleOptions);
     }
     const factoryFn = source;
-    return (scope) => factoryFn().pipe(import_effect10.Scope.extend(scope));
+    return (scope) => import_effect11.Scope.provide(scope)(factoryFn());
   }, [isModule2, moduleTag, source, moduleOptions]);
   const moduleRuntime = cache.readSync(key, factory, void 0, ownerId, {
     entrypoint: "react.useLocalModule",
@@ -2689,9 +2973,9 @@ function createModuleTagFactory(module2, options) {
     throw new Error("useLocalModule(module, options) \u9700\u8981\u63D0\u4F9B initial \u72B6\u6001");
   }
   const logics = options.logics ?? [];
-  return (scope) => import_effect10.Layer.buildWithScope(module2.live(options.initial, ...logics), scope).pipe(
-    import_effect10.Effect.map((context) => {
-      const runtime = import_effect10.Context.get(context, module2);
+  return (scope) => import_effect11.Layer.buildWithScope(module2.live(options.initial, ...logics), scope).pipe(
+    import_effect11.Effect.map((context) => {
+      const runtime = import_effect11.ServiceMap.get(context, module2);
       return runtime;
     })
   );
@@ -2699,12 +2983,12 @@ function createModuleTagFactory(module2, options) {
 
 // src/internal/hooks/useLayerModule.ts
 var import_react11 = __toESM(require("react"), 1);
-var import_effect11 = require("effect");
+var import_effect12 = require("effect");
 function useLayerModule(module2, layer, deps = []) {
   const factory = import_react11.default.useCallback(
-    () => import_effect11.Layer.build(layer).pipe(
-      import_effect11.Effect.scoped,
-      import_effect11.Effect.map((context) => import_effect11.Context.get(context, module2))
+    () => import_effect12.Layer.build(layer).pipe(
+      import_effect12.Effect.scoped,
+      import_effect12.Effect.map((context) => import_effect12.ServiceMap.get(context, module2))
     ),
     // layer/module are typically constants; deps lets callers opt into rebuilding when needed.
     [layer, module2]
@@ -2761,8 +3045,8 @@ function useImportedModule(parent, module2) {
 
 // src/internal/hooks/useProcesses.ts
 var import_react15 = __toESM(require("react"), 1);
-var import_effect12 = require("effect");
-var Logix12 = __toESM(require("@logixjs/core"), 1);
+var import_effect13 = require("effect");
+var Logix13 = __toESM(require("@logixjs/core"), 1);
 var ProcessSubtreeRegistry = class {
   constructor(runtime) {
     this.runtime = runtime;
@@ -2783,7 +3067,7 @@ var ProcessSubtreeRegistry = class {
       }
       return () => this.release({ key: args.key, gcTime: args.gcTime });
     }
-    const scope = import_effect12.Effect.runSync(import_effect12.Scope.make());
+    const scope = import_effect13.Effect.runSync(import_effect13.Scope.make());
     const entry = {
       key: args.key,
       signature: args.signature,
@@ -2811,7 +3095,7 @@ var ProcessSubtreeRegistry = class {
       const current = this.entries.get(entry.key);
       if (!current || current !== entry) return;
       if (current.refCount > 0) return;
-      void this.runtime.runPromise(import_effect12.Scope.close(entry.scope, import_effect12.Exit.void)).catch(() => {
+      void this.runtime.runPromise(import_effect13.Scope.close(entry.scope, import_effect13.Exit.void)).catch(() => {
       });
       this.entries.delete(entry.key);
     }, timeoutMs);
@@ -2828,7 +3112,7 @@ var getRegistry = (runtime) => {
 var stableProcessSignature = (processes) => {
   const ids = [];
   for (let i = 0; i < processes.length; i++) {
-    const def = Logix12.Process.getDefinition(processes[i]);
+    const def = Logix13.Process.getDefinition(processes[i]);
     ids.push(def?.processId ?? `legacy#${i}`);
   }
   return ids.join("|");
@@ -2871,24 +3155,24 @@ function useProcesses(processes, options) {
       signature,
       gcTime,
       install: (scope) => {
-        const program = import_effect12.Effect.forEach(
+        const program = import_effect13.Effect.forEach(
           processes,
-          (process) => Logix12.InternalContracts.installProcess(process, {
+          (process) => Logix13.InternalContracts.installProcess(process, {
             scope: { type: "uiSubtree", subtreeId },
             enabled: true,
             installedAt: "uiSubtree",
             mode
           }).pipe(
-            import_effect12.Effect.flatMap((installation) => {
+            import_effect13.Effect.flatMap((installation) => {
               if (installation !== void 0) {
-                return import_effect12.Effect.void;
+                return import_effect13.Effect.void;
               }
-              return import_effect12.Effect.forkScoped(process).pipe(import_effect12.Effect.asVoid);
+              return import_effect13.Effect.forkScoped(process).pipe(import_effect13.Effect.asVoid);
             }),
-            import_effect12.Effect.catchAll(() => import_effect12.Effect.forkScoped(process).pipe(import_effect12.Effect.asVoid))
+            import_effect13.Effect.catch(() => import_effect13.Effect.forkScoped(process).pipe(import_effect13.Effect.asVoid))
           ),
           { discard: true }
-        ).pipe(import_effect12.Effect.provideService(import_effect12.Scope.Scope, scope));
+        ).pipe(import_effect13.Effect.provideService(import_effect13.Scope.Scope, scope));
         void runtime.runPromise(program).catch(() => {
         });
       }
@@ -2897,7 +3181,7 @@ function useProcesses(processes, options) {
 }
 
 // src/internal/platform/ReactPlatformLayer.ts
-var import_effect13 = require("effect");
+var import_effect14 = require("effect");
 var import_core = require("@logixjs/core");
 var ReactPlatformImpl = class {
   constructor(suspendRef, resumeRef, resetRef) {
@@ -2905,27 +3189,24 @@ var ReactPlatformImpl = class {
     this.resumeRef = resumeRef;
     this.resetRef = resetRef;
     this.lifecycle = {
-      onSuspend: (eff) => import_effect13.Ref.update(this.suspendRef, (list) => [...list, eff]).pipe(import_effect13.Effect.asVoid),
-      onResume: (eff) => import_effect13.Ref.update(this.resumeRef, (list) => [...list, eff]).pipe(import_effect13.Effect.asVoid),
-      onReset: (eff) => import_effect13.Ref.update(this.resetRef, (list) => [...list, eff]).pipe(import_effect13.Effect.asVoid)
+      onSuspend: (eff) => import_effect14.Ref.update(this.suspendRef, (list) => [...list, eff]).pipe(import_effect14.Effect.asVoid),
+      onResume: (eff) => import_effect14.Ref.update(this.resumeRef, (list) => [...list, eff]).pipe(import_effect14.Effect.asVoid),
+      onReset: (eff) => import_effect14.Ref.update(this.resetRef, (list) => [...list, eff]).pipe(import_effect14.Effect.asVoid)
     };
     // The emit* methods are not part of the official Logic.Platform interface; they are for host/test use only.
     // After retrieving the instance via `Effect.service(Logic.Platform)`, call them via `any`.
-    this.emitSuspend = () => import_effect13.Ref.get(this.suspendRef).pipe(import_effect13.Effect.flatMap((effects) => import_effect13.Effect.forEach(effects, (eff) => eff, { discard: true })));
-    this.emitResume = () => import_effect13.Ref.get(this.resumeRef).pipe(import_effect13.Effect.flatMap((effects) => import_effect13.Effect.forEach(effects, (eff) => eff, { discard: true })));
-    this.emitReset = () => import_effect13.Ref.get(this.resetRef).pipe(import_effect13.Effect.flatMap((effects) => import_effect13.Effect.forEach(effects, (eff) => eff, { discard: true })));
+    this.emitSuspend = () => import_effect14.Ref.get(this.suspendRef).pipe(import_effect14.Effect.flatMap((effects) => import_effect14.Effect.forEach(effects, (eff) => eff, { discard: true })));
+    this.emitResume = () => import_effect14.Ref.get(this.resumeRef).pipe(import_effect14.Effect.flatMap((effects) => import_effect14.Effect.forEach(effects, (eff) => eff, { discard: true })));
+    this.emitReset = () => import_effect14.Ref.get(this.resetRef).pipe(import_effect14.Effect.flatMap((effects) => import_effect14.Effect.forEach(effects, (eff) => eff, { discard: true })));
   }
 };
-var makeReactPlatform = import_effect13.Effect.gen(function* () {
-  const suspendRef = yield* import_effect13.Ref.make([]);
-  const resumeRef = yield* import_effect13.Ref.make([]);
-  const resetRef = yield* import_effect13.Ref.make([]);
+var makeReactPlatform = import_effect14.Effect.gen(function* () {
+  const suspendRef = yield* import_effect14.Ref.make([]);
+  const resumeRef = yield* import_effect14.Ref.make([]);
+  const resetRef = yield* import_effect14.Ref.make([]);
   return new ReactPlatformImpl(suspendRef, resumeRef, resetRef);
 });
-var ReactPlatformLayer = import_effect13.Layer.scoped(
-  import_core.Platform.tag,
-  makeReactPlatform
-);
+var ReactPlatformLayer = import_effect14.Layer.effect(import_core.Platform.tag, makeReactPlatform);
 
 // src/ReactPlatform.ts
 var import_react16 = __toESM(require("react"), 1);
@@ -2968,16 +3249,19 @@ var ReactPlatform = {
 
 // src/ModuleScope.ts
 var import_react17 = __toESM(require("react"), 1);
-var Logix13 = __toESM(require("@logixjs/core"), 1);
+var import_effect15 = require("effect");
+var Logix14 = __toESM(require("@logixjs/core"), 1);
 var makeModuleScope = (handle, defaults) => {
-  const Context7 = import_react17.default.createContext(null);
+  const Context = import_react17.default.createContext(null);
   const toUseModuleOptions = (options) => {
     const { scopeId, ...rest } = options;
     return scopeId != null ? { ...rest, key: scopeId } : rest;
   };
   const getRegistryOrThrow = (runtime, where) => {
     try {
-      const registry = runtime.runSync(Logix13.ScopeRegistry.ScopeRegistryTag);
+      const registry = runtime.runSync(
+        import_effect15.Effect.service(Logix14.ScopeRegistry.ScopeRegistryTag).pipe(import_effect15.Effect.orDie)
+      );
       if (!registry) {
         throw new Error("ScopeRegistry service is undefined");
       }
@@ -2988,7 +3272,7 @@ var makeModuleScope = (handle, defaults) => {
       );
     }
   };
-  const moduleToken = Logix13.Module.hasImpl(handle) ? handle.tag : handle.module;
+  const moduleToken = Logix14.Module.hasImpl(handle) ? handle.tag : handle.module;
   const Provider = ({ children, options }) => {
     const runtime = useRuntime();
     const merged = defaults || options ? { ...defaults ?? {}, ...options ?? {} } : void 0;
@@ -2997,17 +3281,17 @@ var makeModuleScope = (handle, defaults) => {
     import_react17.default.useEffect(() => {
       if (!scopeId) return;
       const registry = getRegistryOrThrow(runtime, "[ModuleScope]");
-      const leaseRuntime = registry.register(scopeId, Logix13.ScopeRegistry.ScopedRuntimeTag, runtime);
+      const leaseRuntime = registry.register(scopeId, Logix14.ScopeRegistry.ScopedRuntimeTag, runtime);
       const leaseModule = registry.register(scopeId, moduleToken, ref.runtime);
       return () => {
         leaseModule.release();
         leaseRuntime.release();
       };
     }, [runtime, scopeId, ref.runtime]);
-    return import_react17.default.createElement(Context7.Provider, { value: ref }, children);
+    return import_react17.default.createElement(Context.Provider, { value: ref }, children);
   };
   const use = () => {
-    const ref = import_react17.default.useContext(Context7);
+    const ref = import_react17.default.useContext(Context);
     if (!ref) {
       throw new Error("[ModuleScope] Provider not found");
     }
@@ -3020,7 +3304,7 @@ var makeModuleScope = (handle, defaults) => {
   const Bridge = ({ scopeId, children }) => {
     const runtime = useRuntime();
     const registry = getRegistryOrThrow(runtime, "[ModuleScope.Bridge]");
-    const scopedRuntime = registry.get(scopeId, Logix13.ScopeRegistry.ScopedRuntimeTag);
+    const scopedRuntime = registry.get(scopeId, Logix14.ScopeRegistry.ScopedRuntimeTag);
     const moduleRuntime = registry.get(scopeId, moduleToken);
     if (!scopedRuntime || !moduleRuntime) {
       throw new Error(
@@ -3030,18 +3314,18 @@ var makeModuleScope = (handle, defaults) => {
     return import_react17.default.createElement(
       RuntimeProvider,
       { runtime: scopedRuntime },
-      import_react17.default.createElement(BridgeInner, { moduleRuntime, Context: Context7 }, children)
+      import_react17.default.createElement(BridgeInner, { moduleRuntime, Context }, children)
     );
   };
   const BridgeInner = ({
     moduleRuntime,
-    Context: Context8,
+    Context: Context2,
     children
   }) => {
     const ref = useModule(moduleRuntime);
-    return import_react17.default.createElement(Context8.Provider, { value: ref }, children);
+    return import_react17.default.createElement(Context2.Provider, { value: ref }, children);
   };
-  return { Provider, use, useImported, Context: Context7, Bridge };
+  return { Provider, use, useImported, Context, Bridge };
 };
 var ModuleScope = {
   make: makeModuleScope