@logixjs/react 0.1.0 → 1.0.0

package/dist/Hooks.cjs

@@ -125,14 +125,11 @@ var useLayerBinding = (runtime, layer, enabled, onError) => {
     const newScope = import_effect.Effect.runSync(import_effect.Scope.make());
     const buildEffect = import_effect.Effect.gen(function* () {
       const context = yield* import_effect.Layer.buildWithScope(layer, newScope);
-      const applyEnv = (effect) => import_effect.Effect.mapInputContext(
-        import_effect.Scope.extend(effect, newScope),
-        (parent) => import_effect.Context.merge(parent, context)
-      );
-      const loggers = yield* applyEnv(import_effect.FiberRef.get(import_effect.FiberRef.currentLoggers));
-      const logLevel = yield* applyEnv(import_effect.FiberRef.get(import_effect.FiberRef.currentLogLevel));
+      const applyEnv = (effect) => import_effect.Scope.provide(newScope)(import_effect.Effect.provideServices(effect, context));
+      const loggers = yield* applyEnv(import_effect.Effect.service(import_effect.Logger.CurrentLoggers)).pipe(import_effect.Effect.orDie);
+      const logLevel = yield* applyEnv(import_effect.Effect.service(import_effect.References.MinimumLogLevel)).pipe(import_effect.Effect.orDie);
       const debugSinks = yield* applyEnv(
-        import_effect.FiberRef.get(Logix.Debug.internal.currentDebugSinks)
+        import_effect.Effect.service(Logix.Debug.internal.currentDebugSinks).pipe(import_effect.Effect.orDie)
       );
       return { context, loggers, logLevel, debugSinks };
     });
@@ -177,7 +174,7 @@ var useLayerBinding = (runtime, layer, enabled, onError) => {
           const cause = import_effect.Cause.die(error);
           runtime.runFork(
             onError(cause, { source: "provider", phase: "provider.layer.build" }).pipe(
-              import_effect.Effect.catchAllCause(() => import_effect.Effect.void)
+              import_effect.Effect.catchCause(() => import_effect.Effect.void)
             )
           );
         }
@@ -215,18 +212,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_effect.Effect.mapInputContext(
-        acc,
-        (parent) => import_effect.Context.merge(parent, ctx)
-      ),
-      scopes.reduceRight(
-        (acc, scope) => import_effect.Scope.extend(acc, scope),
-        effect
-      )
+  const applyContexts = (effect) => contexts.reduceRight(
+    (acc, ctx) => import_effect.Effect.provideServices(acc, ctx),
+    scopes.reduceRight(
+      (acc, scope) => import_effect.Scope.provide(scope)(acc),
+      effect
     )
   );
   const applyLoggers = (effect) => {
@@ -235,16 +225,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_effect.Effect.locally(import_effect.FiberRef.currentLoggers, last)(result);
+      result = import_effect.Effect.provideService(result, import_effect.Logger.CurrentLoggers, last);
     }
     if (logLevel) {
-      result = import_effect.Effect.locally(import_effect.FiberRef.currentLogLevel, logLevel)(result);
+      result = import_effect.Effect.provideService(result, import_effect.References.MinimumLogLevel, logLevel);
     }
     if (sinks && sinks.length > 0) {
-      result = import_effect.Effect.locally(
-        Logix.Debug.internal.currentDebugSinks,
-        sinks
-      )(result);
+      result = import_effect.Effect.provideService(result, Logix.Debug.internal.currentDebugSinks, sinks);
     }
     return result;
   };
@@ -336,13 +323,13 @@ function useRuntime(options) {
 
 // src/internal/hooks/useModule.ts
 var import_react7 = __toESM(require("react"), 1);
-var Logix7 = __toESM(require("@logixjs/core"), 1);
+var Logix9 = __toESM(require("@logixjs/core"), 1);
 var import_effect8 = require("effect");
 
 // src/internal/hooks/useModuleRuntime.ts
 var import_react4 = require("react");
-var Logix4 = __toESM(require("@logixjs/core"), 1);
-var import_effect5 = require("effect");
+var Logix5 = __toESM(require("@logixjs/core"), 1);
+var import_effect6 = require("effect");
 
 // src/internal/store/ModuleRef.ts
 var isModuleRef = (value) => typeof value === "object" && value !== null && "runtime" in value && "actions" in value && "dispatch" in value;
@@ -433,27 +420,41 @@ var applyHandleExtend = (tag, runtime, base) => {
   return { ...base, ...next };
 };
 
+// src/internal/provider/runtimeDebugBridge.ts
+var import_effect3 = require("effect");
+var Logix2 = __toESM(require("@logixjs/core"), 1);
+var readRuntimeDiagnosticsLevel = (runtime) => {
+  try {
+    return runtime.runSync(import_effect3.Effect.service(Logix2.Debug.internal.currentDiagnosticsLevel).pipe(import_effect3.Effect.orDie));
+  } catch {
+    return (0, import_Env.isDevEnv)() ? "light" : "off";
+  }
+};
+var emitRuntimeDebugEventBestEffort = (runtime, event) => {
+  runtime.runFork(event);
+};
+
 // src/internal/store/ModuleCache.ts
-var Logix3 = __toESM(require("@logixjs/core"), 1);
-var import_effect4 = require("effect");
+var Logix4 = __toESM(require("@logixjs/core"), 1);
+var import_effect5 = require("effect");
 
 // src/internal/store/perfWorkloads.ts
-var Logix2 = __toESM(require("@logixjs/core"), 1);
-var import_effect3 = require("effect");
-var PerfCounterStateSchema = import_effect3.Schema.Struct({
-  value: import_effect3.Schema.Number
+var Logix3 = __toESM(require("@logixjs/core"), 1);
+var import_effect4 = require("effect");
+var PerfCounterStateSchema = import_effect4.Schema.Struct({
+  value: import_effect4.Schema.Number
 });
 var PerfCounterActions = {
-  inc: import_effect3.Schema.Void
+  inc: import_effect4.Schema.Void
 };
-var PerfListScopeRowSchema = import_effect3.Schema.Struct({
-  id: import_effect3.Schema.String,
-  warehouseId: import_effect3.Schema.String
+var PerfListScopeRowSchema = import_effect4.Schema.Struct({
+  id: import_effect4.Schema.String,
+  warehouseId: import_effect4.Schema.String
 });
-var PerfListScopeStateSchema = import_effect3.Schema.Struct({
-  items: import_effect3.Schema.Array(PerfListScopeRowSchema),
-  digest: import_effect3.Schema.String,
-  errors: import_effect3.Schema.Any
+var PerfListScopeStateSchema = import_effect4.Schema.Struct({
+  items: import_effect4.Schema.Array(PerfListScopeRowSchema),
+  digest: import_effect4.Schema.String,
+  errors: import_effect4.Schema.Any
 });
 var GLOBAL_YIELD_BUDGET_MEMORY_KEY = "__LOGIX_REACT_YIELD_BUDGET_MEMORY__";
 var getGlobalYieldBudgetMemory = () => {
@@ -548,20 +549,20 @@ ${message}`;
   console.debug(label, message);
 };
 var causeToUnknown = (cause) => {
-  const failure = import_effect4.Option.getOrUndefined(import_effect4.Cause.failureOption(cause));
+  const failure = import_effect5.Option.getOrUndefined(import_effect5.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_effect5.Cause.isDieReason).map((reason) => reason.defect)[0];
   if (defect !== void 0) return defect;
   return cause;
 };
 var yieldEffect = (strategy) => {
   switch (strategy) {
     case "none":
-      return import_effect4.Effect.void;
+      return import_effect5.Effect.void;
     case "microtask":
-      return import_effect4.Effect.yieldNow();
+      return import_effect5.Effect.yieldNow;
     case "macrotask":
-      return import_effect4.Effect.promise(
+      return import_effect5.Effect.promise(
         () => new Promise((resolve) => {
           setTimeout(resolve, 0);
         })
@@ -609,11 +610,11 @@ var ModuleCache = class {
         this.scheduleGC(key, current);
         return;
       }
-      void this.runtime.runPromise(import_effect4.Scope.close(current.scope, import_effect4.Exit.void)).catch((error) => {
+      void this.runtime.runPromise(import_effect5.Scope.close(current.scope, import_effect5.Exit.void)).catch((error) => {
         debugBestEffortFailure("[ModuleCache] Scope.close failed", error);
       });
       void this.runtime.runPromise(
-        Logix3.Debug.record({
+        Logix4.Debug.record({
           type: "trace:react.module-instance",
           moduleId: current.ownerId,
           instanceId: current.value?.instanceId,
@@ -649,9 +650,70 @@ var ModuleCache = class {
       }
       return existing.value;
     }
-    const scope = import_effect4.Effect.runSync(import_effect4.Scope.make());
+    const scope = import_effect5.Effect.runSync(import_effect5.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",
@@ -667,11 +729,11 @@ 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_effect5.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) => {
-      if (import_effect4.Exit.isSuccess(exit)) return exit.value;
+    const promise = this.runtime.runPromise(import_effect5.Fiber.await(fiber)).then((exit) => {
+      if (import_effect5.Exit.isSuccess(exit)) return exit.value;
       throw causeToUnknown(exit.cause);
     });
     promise.then((value) => {
@@ -679,9 +741,9 @@ var ModuleCache = class {
       entry.value = value;
       const durationMs = performance.now() - startedAt;
       YieldBudgetMemory.record({ runtime: this.runtime, workloadKey, durationMs });
-      if ((0, import_Env.isDevEnv)() || Logix3.Debug.isDevtoolsEnabled()) {
+      if ((0, import_Env.isDevEnv)() || Logix4.Debug.isDevtoolsEnabled()) {
         void this.runtime.runPromise(
-          Logix3.Debug.record({
+          Logix4.Debug.record({
             type: "trace:react.module.init",
             moduleId: ownerId,
             instanceId: value.instanceId,
@@ -698,7 +760,7 @@ var ModuleCache = class {
           debugBestEffortFailure("[ModuleCache] Debug.record failed", error);
         });
         void this.runtime.runPromise(
-          Logix3.Debug.record({
+          Logix4.Debug.record({
             type: "trace:react.module-instance",
             moduleId: ownerId,
             instanceId: value.instanceId,
@@ -728,7 +790,7 @@ var ModuleCache = class {
         workloadKey,
         durationMs: performance.now() - startedAt
       });
-      void this.runtime.runPromise(import_effect4.Scope.close(scope, import_effect4.Exit.fail(error))).catch((closeError) => {
+      void this.runtime.runPromise(import_effect5.Scope.close(scope, import_effect5.Exit.fail(error))).catch((closeError) => {
         debugBestEffortFailure("[ModuleCache] Scope.close failed", closeError);
       });
       throw error;
@@ -760,7 +822,7 @@ var ModuleCache = class {
       }
       return existing.value;
     }
-    const scope = this.runtime.runSync(import_effect4.Scope.make());
+    const scope = this.runtime.runSync(import_effect5.Scope.make());
     const startedAt = performance.now();
     try {
       const value = this.runtime.runSync(factory(scope));
@@ -808,9 +870,9 @@ var ModuleCache = class {
           }
         }
       }
-      if ((0, import_Env.isDevEnv)() || Logix3.Debug.isDevtoolsEnabled()) {
+      if ((0, import_Env.isDevEnv)() || Logix4.Debug.isDevtoolsEnabled()) {
         void this.runtime.runPromise(
-          Logix3.Debug.record({
+          Logix4.Debug.record({
             type: "trace:react.module.init",
             moduleId: ownerId,
             instanceId: value.instanceId,
@@ -825,7 +887,7 @@ var ModuleCache = class {
           debugBestEffortFailure("[ModuleCache] Debug.record failed", error);
         });
         void this.runtime.runPromise(
-          Logix3.Debug.record({
+          Logix4.Debug.record({
             type: "trace:react.module-instance",
             moduleId: ownerId,
             instanceId: value.instanceId,
@@ -842,7 +904,7 @@ var ModuleCache = class {
       }
       return value;
     } catch (error) {
-      void this.runtime.runPromise(import_effect4.Scope.close(scope, import_effect4.Exit.fail(error))).catch((closeError) => {
+      void this.runtime.runPromise(import_effect5.Scope.close(scope, import_effect5.Exit.fail(error))).catch((closeError) => {
         debugBestEffortFailure("[ModuleCache] Scope.close failed", closeError);
       });
       const entry = {
@@ -863,6 +925,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_effect5.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_effect5.Scope.close(scope, import_effect5.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) {
@@ -887,11 +992,43 @@ var ModuleCache = class {
         }
       };
     }
-    const scope = import_effect4.Effect.runSync(import_effect4.Scope.make());
+    const scope = import_effect5.Effect.runSync(import_effect5.Scope.make());
     const ownerId = options?.ownerId;
     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",
@@ -907,11 +1044,11 @@ 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_effect5.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) => {
-      if (import_effect4.Exit.isSuccess(exit)) return exit.value;
+    const promise = this.runtime.runPromise(import_effect5.Fiber.await(fiber)).then((exit) => {
+      if (import_effect5.Exit.isSuccess(exit)) return exit.value;
       throw causeToUnknown(exit.cause);
     });
     entry.promise = promise;
@@ -937,7 +1074,7 @@ var ModuleCache = class {
         workloadKey,
         durationMs: performance.now() - startedAt
       });
-      void this.runtime.runPromise(import_effect4.Scope.close(scope, import_effect4.Exit.fail(error))).catch((closeError) => {
+      void this.runtime.runPromise(import_effect5.Scope.close(scope, import_effect5.Exit.fail(error))).catch((closeError) => {
         debugBestEffortFailure("[ModuleCache] Scope.close failed", closeError);
       });
     });
@@ -969,9 +1106,9 @@ var ModuleCache = class {
       entry.fiber = void 0;
       this.entries.delete(key);
       if (running) {
-        this.runtime.runFork(import_effect4.Fiber.interrupt(running));
+        this.runtime.runFork(import_effect5.Fiber.interrupt(running));
       }
-      void this.runtime.runPromise(import_effect4.Scope.close(entry.scope, import_effect4.Exit.void)).catch((closeError) => {
+      void this.runtime.runPromise(import_effect5.Scope.close(entry.scope, import_effect5.Exit.void)).catch((closeError) => {
         debugBestEffortFailure("[ModuleCache] Scope.close failed", closeError);
       });
       return;
@@ -1017,7 +1154,7 @@ var ModuleCache = class {
       if (entry.gcTimeout) {
         clearTimeout(entry.gcTimeout);
       }
-      void this.runtime.runPromise(import_effect4.Scope.close(entry.scope, import_effect4.Exit.void)).catch((error) => {
+      void this.runtime.runPromise(import_effect5.Scope.close(entry.scope, import_effect5.Exit.void)).catch((error) => {
         debugBestEffortFailure("[ModuleCache] Scope.close failed", error);
       });
       this.entries.delete(key);
@@ -1073,6 +1210,7 @@ var isModuleRuntime = (value) => typeof value === "object" && value !== null &&
 function useModuleRuntime(handle) {
   const runtime = useRuntime();
   const runtimeContext = (0, import_react4.useContext)(RuntimeContext);
+  const moduleTagResolveTraceRef = (0, import_react4.useRef)(void 0);
   if (!runtimeContext) {
     throw new RuntimeProviderNotFoundError("useModuleRuntime");
   }
@@ -1093,36 +1231,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_effect5.Scope.extend(scope));
-    return mode === "suspend" ? cache.read(key, factory, void 0, tokenId, {
+    const startedAtMs = performance.now();
+    const factory = (scope) => import_effect6.Scope.provide(scope)(import_effect6.Effect.service(tag).pipe(import_effect6.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_react4.useEffect)(() => {
     if (!isTagHandle) {
       return;
     }
-    if (!(0, import_Env.isDevEnv)() && !Logix4.Debug.isDevtoolsEnabled()) {
+    const diagnosticsLevel = readRuntimeDiagnosticsLevel(runtime);
+    if (diagnosticsLevel === "off") {
       return;
     }
     const tokenId = handle?.id ?? "ModuleTag";
-    const effect = Logix4.Debug.record({
+    const trace = moduleTagResolveTraceRef.current;
+    const effect = Logix5.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;
 }
@@ -1130,55 +1280,73 @@ function useModuleRuntime(handle) {
 // src/internal/hooks/useSelector.ts
 var import_react5 = require("react");
 var import_with_selector = require("use-sync-external-store/shim/with-selector");
-var Logix5 = __toESM(require("@logixjs/core"), 1);
+var Logix7 = __toESM(require("@logixjs/core"), 1);
 
-// src/internal/store/ModuleRuntimeExternalStore.ts
-var import_effect6 = require("effect");
+// src/internal/store/RuntimeExternalStore.ts
+var Logix6 = __toESM(require("@logixjs/core"), 1);
+var import_effect7 = require("effect");
 var storesByRuntime = /* @__PURE__ */ new WeakMap();
 var getStoreMapForRuntime = (runtime) => {
   const cached = storesByRuntime.get(runtime);
   if (cached) return cached;
-  const next = /* @__PURE__ */ new WeakMap();
+  const next = /* @__PURE__ */ new Map();
   storesByRuntime.set(runtime, next);
   return next;
 };
-var getModuleRuntimeExternalStore = (runtime, moduleRuntime, options) => {
-  const byModule = getStoreMapForRuntime(runtime);
-  const cached = byModule.get(moduleRuntime);
+var makeModuleInstanceKey = (moduleId, instanceId) => `${moduleId}::${instanceId}`;
+var makeReadQueryTopicKey = (moduleInstanceKey, selectorId) => `${moduleInstanceKey}::rq:${selectorId}`;
+var getRuntimeStore = (runtime) => Logix6.InternalContracts.getRuntimeStore(runtime);
+var getHostScheduler = (runtime) => Logix6.InternalContracts.getHostScheduler(runtime);
+var getOrCreateStore = (runtime, topicKey, make) => {
+  const map = getStoreMapForRuntime(runtime);
+  const cached = map.get(topicKey);
   if (cached) {
     return cached;
   }
-  let currentState;
+  const created = make();
+  map.set(topicKey, created);
+  return created;
+};
+var removeStore = (runtime, topicKey) => {
+  const map = storesByRuntime.get(runtime);
+  if (!map) return;
+  map.delete(topicKey);
+};
+var makeTopicExternalStore = (args) => {
+  const { runtime, runtimeStore, topicKey } = args;
+  const hostScheduler = getHostScheduler(runtime);
+  let currentVersion;
+  let hasSnapshot = false;
+  let currentSnapshot;
   const listeners = /* @__PURE__ */ new Set();
-  const lowPriorityDelayMs = options?.lowPriorityDelayMs ?? 16;
-  const lowPriorityMaxDelayMs = options?.lowPriorityMaxDelayMs ?? 50;
+  let unsubscribeFromRuntimeStore;
+  let teardownScheduled = false;
+  let teardownToken = 0;
+  const lowPriorityDelayMs = args.options?.lowPriorityDelayMs ?? 16;
+  const lowPriorityMaxDelayMs = args.options?.lowPriorityMaxDelayMs ?? 50;
   let notifyScheduled = false;
   let notifyScheduledLow = false;
-  let lowTimeoutId;
-  let lowMaxTimeoutId;
-  let lowRafId;
+  let lowCancelDelay;
+  let lowCancelMaxDelay;
+  let lowCancelRaf;
   const cancelLow = () => {
     if (!notifyScheduledLow) return;
     notifyScheduledLow = false;
-    if (lowTimeoutId != null) {
-      clearTimeout(lowTimeoutId);
-      lowTimeoutId = void 0;
-    }
-    if (lowMaxTimeoutId != null) {
-      clearTimeout(lowMaxTimeoutId);
-      lowMaxTimeoutId = void 0;
-    }
-    const cancel = globalThis.cancelAnimationFrame;
-    if (cancel && typeof lowRafId === "number") {
-      cancel(lowRafId);
-      lowRafId = void 0;
-    }
+    lowCancelDelay?.();
+    lowCancelDelay = void 0;
+    lowCancelMaxDelay?.();
+    lowCancelMaxDelay = void 0;
+    lowCancelRaf?.();
+    lowCancelRaf = void 0;
   };
   const flushNotify = () => {
     notifyScheduled = false;
     cancelLow();
     for (const listener of listeners) {
-      listener();
+      try {
+        listener();
+      } catch {
+      }
     }
   };
   const scheduleNotify = (priority) => {
@@ -1190,72 +1358,155 @@ var getModuleRuntimeExternalStore = (runtime, moduleRuntime, options) => {
         if (!notifyScheduledLow) return;
         flushNotify();
       };
-      const raf = globalThis.requestAnimationFrame;
-      if (raf) {
-        lowRafId = raf(flush);
+      const scheduleRaf = () => {
+        if (!notifyScheduledLow) return;
+        lowCancelRaf = hostScheduler.scheduleAnimationFrame(flush);
+      };
+      if (lowPriorityDelayMs <= 0) {
+        scheduleRaf();
       } else {
-        lowTimeoutId = setTimeout(flush, lowPriorityDelayMs);
+        lowCancelDelay = hostScheduler.scheduleTimeout(lowPriorityDelayMs, scheduleRaf);
       }
-      lowMaxTimeoutId = setTimeout(flush, lowPriorityMaxDelayMs);
+      lowCancelMaxDelay = hostScheduler.scheduleTimeout(lowPriorityMaxDelayMs, flush);
       return;
     }
     cancelLow();
     if (notifyScheduled) return;
     notifyScheduled = true;
-    queueMicrotask(flushNotify);
+    hostScheduler.scheduleMicrotask(flushNotify);
+  };
+  const onRuntimeStoreChange = () => {
+    try {
+      scheduleNotify(runtimeStore.getTopicPriority(topicKey));
+    } catch {
+    }
   };
-  let fiber;
   const ensureSubscription = () => {
-    if (fiber) return;
-    fiber = runtime.runFork(
-      import_effect6.Stream.runForEach(
-        moduleRuntime.changesWithMeta((state) => state),
-        ({ value: state, meta }) => import_effect6.Effect.sync(() => {
-          currentState = state;
-          scheduleNotify(meta.priority);
-        })
-      )
-    );
+    if (unsubscribeFromRuntimeStore) return;
+    unsubscribeFromRuntimeStore = runtimeStore.subscribeTopic(topicKey, onRuntimeStoreChange);
   };
   const refreshSnapshotIfStale = () => {
-    if (currentState === void 0) {
-      return;
-    }
+    if (!hasSnapshot) return;
     try {
-      const latest = runtime.runSync(moduleRuntime.getState);
-      if (currentState === void 0 || !Object.is(currentState, latest)) {
-        currentState = latest;
-        scheduleNotify("normal");
+      const version = runtimeStore.getTopicVersion(topicKey);
+      if (currentVersion !== version) {
+        scheduleNotify(runtimeStore.getTopicPriority(topicKey));
       }
     } catch {
     }
   };
   const getSnapshot = () => {
-    if (currentState !== void 0) return currentState;
-    currentState = runtime.runSync(moduleRuntime.getState);
-    return currentState;
+    const version = runtimeStore.getTopicVersion(topicKey);
+    if (hasSnapshot && currentVersion === version) {
+      return currentSnapshot;
+    }
+    const next = args.readSnapshot();
+    currentVersion = version;
+    hasSnapshot = true;
+    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();
     refreshSnapshotIfStale();
+    if (isFirst) {
+      try {
+        args.onFirstListener?.();
+      } catch {
+      }
+    }
     return () => {
       listeners.delete(listener);
       if (listeners.size > 0) return;
-      const running = fiber;
-      if (!running) return;
-      fiber = void 0;
-      cancelLow();
-      runtime.runFork(import_effect6.Fiber.interrupt(running));
+      scheduleTeardown();
     };
   };
-  const store = { getSnapshot, subscribe };
-  byModule.set(moduleRuntime, store);
-  return store;
+  return { getSnapshot, getServerSnapshot: getSnapshot, subscribe };
+};
+var getRuntimeModuleExternalStore = (runtime, moduleRuntime, options) => {
+  const moduleInstanceKey = makeModuleInstanceKey(moduleRuntime.moduleId, moduleRuntime.instanceId);
+  const runtimeStore = getRuntimeStore(runtime);
+  return getOrCreateStore(
+    runtime,
+    moduleInstanceKey,
+    () => makeTopicExternalStore({
+      runtime,
+      runtimeStore,
+      topicKey: moduleInstanceKey,
+      readSnapshot: () => {
+        const state = runtimeStore.getModuleState(moduleInstanceKey);
+        if (state !== void 0) return state;
+        return runtime.runSync(moduleRuntime.getState);
+      },
+      options
+    })
+  );
+};
+var getRuntimeReadQueryExternalStore = (runtime, moduleRuntime, selectorReadQuery, options) => {
+  const moduleInstanceKey = makeModuleInstanceKey(moduleRuntime.moduleId, moduleRuntime.instanceId);
+  const topicKey = makeReadQueryTopicKey(moduleInstanceKey, selectorReadQuery.selectorId);
+  const runtimeStore = getRuntimeStore(runtime);
+  let readQueryDrainFiber;
+  return getOrCreateStore(
+    runtime,
+    topicKey,
+    () => makeTopicExternalStore({
+      runtime,
+      runtimeStore,
+      topicKey,
+      readSnapshot: () => {
+        const state = runtimeStore.getModuleState(moduleInstanceKey);
+        const current = state ?? runtime.runSync(moduleRuntime.getState);
+        return selectorReadQuery.select(current);
+      },
+      options,
+      onFirstListener: () => {
+        if (readQueryDrainFiber) return;
+        const effect = import_effect7.Stream.runDrain(moduleRuntime.changesReadQueryWithMeta(selectorReadQuery));
+        readQueryDrainFiber = runtime.runFork(effect);
+      },
+      onLastListener: () => {
+        const fiber = readQueryDrainFiber;
+        if (!fiber) return;
+        readQueryDrainFiber = void 0;
+        runtime.runFork(import_effect7.Fiber.interrupt(fiber));
+      }
+    })
+  );
 };
-
-// src/internal/store/ModuleRuntimeSelectorExternalStore.ts
-var import_effect7 = require("effect");
 
 // src/internal/hooks/shallow.ts
 var hasObjectShape = (value) => typeof value === "object" && value !== null;
@@ -1307,146 +1558,6 @@ var shallow = (previous, next) => {
   return true;
 };
 
-// src/internal/store/ModuleRuntimeSelectorExternalStore.ts
-var storesByRuntime2 = /* @__PURE__ */ new WeakMap();
-var getStoreMapForRuntime2 = (runtime) => {
-  const cached = storesByRuntime2.get(runtime);
-  if (cached) return cached;
-  const next = /* @__PURE__ */ new WeakMap();
-  storesByRuntime2.set(runtime, next);
-  return next;
-};
-var getOrCreateSelectorMapForModule = (byModule, moduleRuntime) => {
-  const cached = byModule.get(moduleRuntime);
-  if (cached) return cached;
-  const next = /* @__PURE__ */ new Map();
-  byModule.set(moduleRuntime, next);
-  return next;
-};
-var equalsValue = (readQuery, a, b) => {
-  if (readQuery.equalsKind === "custom" && typeof readQuery.equals === "function") {
-    return readQuery.equals(a, b);
-  }
-  if (readQuery.equalsKind === "shallowStruct") {
-    return shallow(a, b);
-  }
-  return Object.is(a, b);
-};
-var getModuleRuntimeSelectorExternalStore = (runtime, moduleRuntime, selectorReadQuery, options) => {
-  const byModule = getStoreMapForRuntime2(runtime);
-  const bySelector = getOrCreateSelectorMapForModule(byModule, moduleRuntime);
-  const cached = bySelector.get(selectorReadQuery.selectorId);
-  if (cached) {
-    return cached;
-  }
-  let currentValue;
-  const listeners = /* @__PURE__ */ new Set();
-  const lowPriorityDelayMs = options?.lowPriorityDelayMs ?? 16;
-  const lowPriorityMaxDelayMs = options?.lowPriorityMaxDelayMs ?? 50;
-  let notifyScheduled = false;
-  let notifyScheduledLow = false;
-  let lowTimeoutId;
-  let lowMaxTimeoutId;
-  let lowRafId;
-  const cancelLow = () => {
-    if (!notifyScheduledLow) return;
-    notifyScheduledLow = false;
-    if (lowTimeoutId != null) {
-      clearTimeout(lowTimeoutId);
-      lowTimeoutId = void 0;
-    }
-    if (lowMaxTimeoutId != null) {
-      clearTimeout(lowMaxTimeoutId);
-      lowMaxTimeoutId = void 0;
-    }
-    const cancel = globalThis.cancelAnimationFrame;
-    if (cancel && typeof lowRafId === "number") {
-      cancel(lowRafId);
-      lowRafId = void 0;
-    }
-  };
-  const flushNotify = () => {
-    notifyScheduled = false;
-    cancelLow();
-    for (const listener of listeners) {
-      listener();
-    }
-  };
-  const scheduleNotify = (priority) => {
-    if (priority === "low") {
-      if (notifyScheduled) return;
-      if (notifyScheduledLow) return;
-      notifyScheduledLow = true;
-      const flush = () => {
-        if (!notifyScheduledLow) return;
-        flushNotify();
-      };
-      const raf = globalThis.requestAnimationFrame;
-      if (raf) {
-        lowRafId = raf(flush);
-      } else {
-        lowTimeoutId = setTimeout(flush, lowPriorityDelayMs);
-      }
-      lowMaxTimeoutId = setTimeout(flush, lowPriorityMaxDelayMs);
-      return;
-    }
-    cancelLow();
-    if (notifyScheduled) return;
-    notifyScheduled = true;
-    queueMicrotask(flushNotify);
-  };
-  let fiber;
-  const ensureSubscription = () => {
-    if (fiber) return;
-    fiber = runtime.runFork(
-      import_effect7.Stream.runForEach(
-        moduleRuntime.changesReadQueryWithMeta(selectorReadQuery),
-        ({ value, meta }) => import_effect7.Effect.sync(() => {
-          currentValue = value;
-          scheduleNotify(meta.priority);
-        })
-      )
-    );
-  };
-  const refreshSnapshotIfStale = () => {
-    if (currentValue === void 0) {
-      return;
-    }
-    try {
-      const state = runtime.runSync(moduleRuntime.getState);
-      const next = selectorReadQuery.select(state);
-      if (currentValue === void 0 || !equalsValue(selectorReadQuery, currentValue, next)) {
-        currentValue = next;
-        scheduleNotify("normal");
-      }
-    } catch {
-    }
-  };
-  const getSnapshot = () => {
-    if (currentValue !== void 0) return currentValue;
-    const state = runtime.runSync(moduleRuntime.getState);
-    currentValue = selectorReadQuery.select(state);
-    return currentValue;
-  };
-  const subscribe = (listener) => {
-    listeners.add(listener);
-    ensureSubscription();
-    refreshSnapshotIfStale();
-    return () => {
-      listeners.delete(listener);
-      if (listeners.size > 0) return;
-      const running = fiber;
-      if (!running) return;
-      fiber = void 0;
-      cancelLow();
-      runtime.runFork(import_effect7.Fiber.interrupt(running));
-    };
-  };
-  const store = { getSnapshot, subscribe };
-  bySelector.set(selectorReadQuery.selectorId, store);
-  return store;
-};
-
 // src/internal/hooks/useSelector.ts
 function useSelector(handle, selector, equalityFn) {
   const runtimeContext = (0, import_react5.useContext)(RuntimeContext);
@@ -1457,7 +1568,7 @@ function useSelector(handle, selector, equalityFn) {
   const moduleRuntime = useModuleRuntime(handle);
   const actualSelector = selector ?? ((state) => state);
   const selectorReadQuery = (0, import_react5.useMemo)(
-    () => typeof selector === "function" ? Logix5.ReadQuery.compile(selector) : void 0,
+    () => typeof selector === "function" ? Logix7.ReadQuery.compile(selector) : void 0,
     [selector]
   );
   const actualEqualityFn = (0, import_react5.useMemo)(() => {
@@ -1465,17 +1576,12 @@ function useSelector(handle, selector, equalityFn) {
     if (typeof selector !== "function") return Object.is;
     return selectorReadQuery?.equalsKind === "shallowStruct" ? shallow : Object.is;
   }, [equalityFn, selector, selectorReadQuery?.equalsKind]);
-  const useStaticLane = typeof selector === "function" && selectorReadQuery?.lane === "static";
+  const selectorTopicEligible = typeof selector === "function" && selectorReadQuery?.lane === "static" && selectorReadQuery.readsDigest != null && selectorReadQuery.fallbackReason == null;
   const store = (0, import_react5.useMemo)(
-    () => useStaticLane && selectorReadQuery ? getModuleRuntimeSelectorExternalStore(
-      runtime,
-      moduleRuntime,
-      selectorReadQuery,
-      {
-        lowPriorityDelayMs: runtimeContext.reactConfigSnapshot.lowPriorityDelayMs,
-        lowPriorityMaxDelayMs: runtimeContext.reactConfigSnapshot.lowPriorityMaxDelayMs
-      }
-    ) : getModuleRuntimeExternalStore(
+    () => selectorTopicEligible && selectorReadQuery ? getRuntimeReadQueryExternalStore(runtime, moduleRuntime, selectorReadQuery, {
+      lowPriorityDelayMs: runtimeContext.reactConfigSnapshot.lowPriorityDelayMs,
+      lowPriorityMaxDelayMs: runtimeContext.reactConfigSnapshot.lowPriorityMaxDelayMs
+    }) : getRuntimeModuleExternalStore(
       runtime,
       moduleRuntime,
       {
@@ -1489,18 +1595,18 @@ function useSelector(handle, selector, equalityFn) {
       runtimeContext.reactConfigSnapshot.lowPriorityDelayMs,
       runtimeContext.reactConfigSnapshot.lowPriorityMaxDelayMs,
       selectorReadQuery,
-      useStaticLane
+      selectorTopicEligible
     ]
   );
   const selected = (0, import_with_selector.useSyncExternalStoreWithSelector)(
     store.subscribe,
     store.getSnapshot,
-    store.getSnapshot,
-    useStaticLane ? (snapshot) => snapshot : (snapshot) => actualSelector(snapshot),
+    store.getServerSnapshot ?? store.getSnapshot,
+    selectorTopicEligible ? (snapshot) => snapshot : (snapshot) => actualSelector(snapshot),
     actualEqualityFn
   );
   (0, import_react5.useEffect)(() => {
-    if (!(0, import_Env.isDevEnv)() && !Logix5.Debug.isDevtoolsEnabled()) {
+    if (!(0, import_Env.isDevEnv)() && !Logix7.Debug.isDevtoolsEnabled()) {
       return;
     }
     const instanceId = moduleRuntime.instanceId;
@@ -1516,7 +1622,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 = Logix5.Debug.record({
+    const effect = Logix7.Debug.record({
       type: "trace:react-selector",
       moduleId: moduleRuntime.moduleId,
       instanceId,
@@ -1539,7 +1645,7 @@ function useSelector(handle, selector, equalityFn) {
 }
 
 // src/internal/store/resolveImportedModuleRef.ts
-var Logix6 = __toESM(require("@logixjs/core"), 1);
+var Logix8 = __toESM(require("@logixjs/core"), 1);
 var getOrCreateWeakMap = (map, key, make) => {
   const cached = map.get(key);
   if (cached) return cached;
@@ -1563,7 +1669,7 @@ var resolveImportedModuleRef = (runtime, parentRuntime, module2) => {
   if (cached) {
     return cached;
   }
-  const importsScope = Logix6.InternalContracts.getImportsScope(parentRuntime);
+  const importsScope = Logix8.InternalContracts.getImportsScope(parentRuntime);
   const childRuntime = importsScope.get(module2);
   if (childRuntime) {
     const dispatch = Object.assign(
@@ -1649,8 +1755,8 @@ var useStableId = () => {
 
 // src/internal/hooks/useModule.ts
 var isModuleImpl = (handle) => Boolean(handle) && typeof handle === "object" && handle._tag === "ModuleImpl";
-var isModule = (handle) => Logix7.Module.hasImpl(handle);
-var isModuleDef = (handle) => Logix7.Module.is(handle) && handle._kind === "ModuleDef";
+var isModule = (handle) => Logix9.Module.hasImpl(handle);
+var isModuleDef = (handle) => Logix9.Module.is(handle) && handle._kind === "ModuleDef";
 function useModule(handle, selectorOrOptions, equalityFn) {
   const runtimeBase = useRuntime();
   const runtimeContext = import_react7.default.useContext(RuntimeContext);
@@ -1674,6 +1780,7 @@ function useModule(handle, selectorOrOptions, equalityFn) {
     }
   }
   let runtime;
+  const moduleImplResolveTraceRef = import_react7.default.useRef(void 0);
   if (isModuleImpl(normalizedHandle)) {
     const cache = import_react7.default.useMemo(
       () => getModuleCache(runtimeBase, runtimeContext.reactConfigSnapshot, runtimeContext.configVersion),
@@ -1702,9 +1809,9 @@ function useModule(handle, selectorOrOptions, equalityFn) {
     const key = depsHash ? `${baseKey}:${depsHash}` : baseKey;
     const ownerId = moduleId;
     const baseFactory = import_react7.default.useMemo(
-      () => (scope) => import_effect8.Layer.buildWithScope(normalizedHandle.layer, scope).pipe(
+      () => (scope) => import_effect8.Layer.buildWithScope(import_effect8.Layer.fresh(normalizedHandle.layer), scope).pipe(
         import_effect8.Effect.map(
-          (context) => import_effect8.Context.get(context, normalizedHandle.module)
+          (context) => import_effect8.ServiceMap.get(context, normalizedHandle.module)
         )
       ),
       [normalizedHandle]
@@ -1714,26 +1821,56 @@ function useModule(handle, selectorOrOptions, equalityFn) {
         return baseFactory;
       }
       return (scope) => baseFactory(scope).pipe(
-        import_effect8.Effect.timeoutFail({
-          duration: initTimeoutMs,
-          onTimeout: () => new Error(`[useModule] Module "${ownerId}" initialization timed out after ${initTimeoutMs}ms`)
-        })
+        import_effect8.Effect.timeoutOption(initTimeoutMs),
+        import_effect8.Effect.flatMap(
+          (maybe) => maybe._tag === "Some" ? import_effect8.Effect.succeed(maybe.value) : import_effect8.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_react7.default.useEffect(() => cache.retain(key), [cache, key]);
     runtime = moduleRuntime;
   } else {
     runtime = useModuleRuntime(normalizedHandle);
   }
+  import_react7.default.useEffect(() => {
+    if (!isModuleImpl(normalizedHandle)) {
+      return;
+    }
+    const diagnosticsLevel = readRuntimeDiagnosticsLevel(runtimeBase);
+    if (diagnosticsLevel === "off") {
+      return;
+    }
+    const trace = moduleImplResolveTraceRef.current;
+    if (!trace) {
+      return;
+    }
+    const effect = Logix9.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_react7.default.useEffect(() => {
     if (!isModuleImpl(normalizedHandle)) {
       return;
@@ -1743,22 +1880,22 @@ function useModule(handle, selectorOrOptions, equalityFn) {
     if (!label) {
       return;
     }
-    const effect = Logix7.Debug.record({
+    const effect = Logix9.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_react7.default.useEffect(() => {
-    if (!(0, import_Env.isDevEnv)() && !Logix7.Debug.isDevtoolsEnabled()) {
+    if (!(0, import_Env.isDevEnv)() && !Logix9.Debug.isDevtoolsEnabled()) {
       return;
     }
     if (!runtime.instanceId) {
       return;
     }
-    const effect = Logix7.Debug.record({
+    const effect = Logix9.Debug.record({
       type: "trace:react-render",
       moduleId: runtime.moduleId,
       instanceId: runtime.instanceId,
@@ -1768,7 +1905,7 @@ function useModule(handle, selectorOrOptions, equalityFn) {
       }
     });
     runtimeBase.runFork(effect);
-  }, [runtimeBase, runtime]);
+  });
   if (selector) {
     if (isModuleImpl(normalizedHandle)) {
       return useSelector(runtime, selector, equalityFn);
@@ -1855,7 +1992,7 @@ function useModule(handle, selectorOrOptions, equalityFn) {
 
 // src/internal/hooks/useLocalModule.ts
 var import_react8 = __toESM(require("react"), 1);
-var Logix8 = __toESM(require("@logixjs/core"), 1);
+var Logix10 = __toESM(require("@logixjs/core"), 1);
 var import_effect9 = require("effect");
 function isModuleTag(source) {
   if (!source || typeof source !== "object" && typeof source !== "function") {
@@ -1876,7 +2013,7 @@ function useLocalModule(source, second) {
   );
   const componentId = useStableId();
   const moduleTag = import_react8.default.useMemo(() => {
-    if (Logix8.Module.is(source)) {
+    if (Logix10.Module.is(source)) {
       return source.tag;
     }
     if (isModuleTag(source)) {
@@ -1885,7 +2022,7 @@ function useLocalModule(source, second) {
     return null;
   }, [source]);
   const def = import_react8.default.useMemo(() => {
-    if (Logix8.Module.is(source) || isModuleTag(source)) {
+    if (Logix10.Module.is(source) || isModuleTag(source)) {
       return source;
     }
     return void 0;
@@ -1913,7 +2050,7 @@ function useLocalModule(source, second) {
       return createModuleTagFactory(moduleTag, moduleOptions);
     }
     const factoryFn = source;
-    return (scope) => factoryFn().pipe(import_effect9.Scope.extend(scope));
+    return (scope) => import_effect9.Scope.provide(scope)(factoryFn());
   }, [isModule2, moduleTag, source, moduleOptions]);
   const moduleRuntime = cache.readSync(key, factory, void 0, ownerId, {
     entrypoint: "react.useLocalModule",
@@ -1975,7 +2112,7 @@ function createModuleTagFactory(module2, options) {
   const logics = options.logics ?? [];
   return (scope) => import_effect9.Layer.buildWithScope(module2.live(options.initial, ...logics), scope).pipe(
     import_effect9.Effect.map((context) => {
-      const runtime = import_effect9.Context.get(context, module2);
+      const runtime = import_effect9.ServiceMap.get(context, module2);
       return runtime;
     })
   );
@@ -1988,7 +2125,7 @@ function useLayerModule(module2, layer, deps = []) {
   const factory = import_react9.default.useCallback(
     () => import_effect10.Layer.build(layer).pipe(
       import_effect10.Effect.scoped,
-      import_effect10.Effect.map((context) => import_effect10.Context.get(context, module2))
+      import_effect10.Effect.map((context) => import_effect10.ServiceMap.get(context, module2))
     ),
     // layer/module are typically constants; deps lets callers opt into rebuilding when needed.
     [layer, module2]
@@ -2046,7 +2183,7 @@ function useImportedModule(parent, module2) {
 // src/internal/hooks/useProcesses.ts
 var import_react13 = __toESM(require("react"), 1);
 var import_effect11 = require("effect");
-var Logix9 = __toESM(require("@logixjs/core"), 1);
+var Logix11 = __toESM(require("@logixjs/core"), 1);
 var ProcessSubtreeRegistry = class {
   constructor(runtime) {
     this.runtime = runtime;
@@ -2112,7 +2249,7 @@ var getRegistry = (runtime) => {
 var stableProcessSignature = (processes) => {
   const ids = [];
   for (let i = 0; i < processes.length; i++) {
-    const def = Logix9.Process.getDefinition(processes[i]);
+    const def = Logix11.Process.getDefinition(processes[i]);
     ids.push(def?.processId ?? `legacy#${i}`);
   }
   return ids.join("|");
@@ -2157,7 +2294,7 @@ function useProcesses(processes, options) {
       install: (scope) => {
         const program = import_effect11.Effect.forEach(
           processes,
-          (process) => Logix9.InternalContracts.installProcess(process, {
+          (process) => Logix11.InternalContracts.installProcess(process, {
             scope: { type: "uiSubtree", subtreeId },
             enabled: true,
             installedAt: "uiSubtree",
@@ -2169,7 +2306,7 @@ function useProcesses(processes, options) {
               }
               return import_effect11.Effect.forkScoped(process).pipe(import_effect11.Effect.asVoid);
             }),
-            import_effect11.Effect.catchAll(() => import_effect11.Effect.forkScoped(process).pipe(import_effect11.Effect.asVoid))
+            import_effect11.Effect.catch(() => import_effect11.Effect.forkScoped(process).pipe(import_effect11.Effect.asVoid))
           ),
           { discard: true }
         ).pipe(import_effect11.Effect.provideService(import_effect11.Scope.Scope, scope));