octane 0.4.1 → 0.4.2

package/dist/cjs/runtime.cjs

@@ -158,6 +158,7 @@ __export(runtime_exports, {
   isChildrenBlock: () => isChildrenBlock,
   isHydratingStyle: () => isHydratingStyle,
   isInActScope: () => isInActScope,
+  isNativeSignalDiagnosticProbe: () => isNativeSignalDiagnosticProbe,
   isValidElement: () => isValidElement,
   keyedForBlock: () => keyedForBlock,
   lazy: () => lazy,
@@ -357,6 +358,7 @@ var import_transition_state = require("./signals/transition-state.cjs");
 var import_transition_candidate = require("./signals/transition-candidate.cjs");
 var import_read_protocol = require("./signals/read-protocol.cjs");
 var import_native_read_events = require("./signals/native-read-events.cjs");
+var import_diagnostic_local_hook = require("./signals/diagnostic-local-hook.cjs");
 var import_native_read_seeds = require("./signals/native-read-seeds.cjs");
 var import_owner_context = require("./signals/owner-context.cjs");
 var import_document_owner = require("./signals/document-owner.cjs");
@@ -833,12 +835,12 @@ function nativePresentationBinding(owner, slotIndex, el, body, props) {
 }
 function enableNativeReadCollection(abi = 1) {
   if (abi !== 1) throw new Error((0, import_error_codes_client_generated.formatClientError)(58));
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   ensureNativeReadDriver();
 }
 function beginNativeReadScope(scope, abi = 1) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null)
-    throw new PresentationAdoptionMiss(void 0, false);
   if (abi !== 1) throw new Error((0, import_error_codes_client_generated.formatClientError)(58));
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   const block = CURRENT_BLOCK;
   const owner = scope ?? CURRENT_SCOPE;
   if (block === null || owner === null) return -1;
@@ -954,12 +956,14 @@ function endNativeReadScope(token, _completed) {
   if (token >= 0) NATIVE_READ_DRIVER.endScope(token);
 }
 function beginNativeReadWitness(detached = false) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   return detached ? ensureNativeReadDriver().beginWitness(true) : NATIVE_READ_DRIVER?.beginWitness() ?? -1;
 }
 function finishNativeReadWitness(token, completed) {
   return token < 0 ? null : NATIVE_READ_DRIVER.finishWitness(token, completed);
 }
 function replayNativeReadWitness(witness) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   NATIVE_READ_DRIVER?.replay(witness);
 }
 function retainNativeRetryReads(block, reads) {
@@ -6789,7 +6793,8 @@ function renderBlockInner(block) {
   let profileThrown;
   let renderCompleted = false;
   let renderRetry = false;
-  NATIVE_READ_DRIVER?.beginRender(block);
+  if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+    NATIVE_READ_DRIVER?.beginRender(block);
   NATIVE_BLOCK_RETRIES?.get(block)?.clear();
   try {
     if (urgentTransitionRender !== null)
@@ -6857,7 +6862,8 @@ function renderBlockInner(block) {
     CURRENT_SCOPE = prevScope;
     CURRENT_BLOCK = prevBlock;
     try {
-      NATIVE_READ_DRIVER?.endRender(block, renderCompleted, isSuspenseException(profileThrown));
+      if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+        NATIVE_READ_DRIVER?.endRender(block, renderCompleted, isSuspenseException(profileThrown));
     } finally {
       if (urgentTransitionRender !== null)
         urgentTransitionDriver.endUrgent(block, urgentTransitionRender);
@@ -7475,15 +7481,20 @@ function resolveSlot(slot) {
   const resolved = (0, import_hook_slot_cache.resolveHookPath)(slotStack, slot, false);
   return typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ ? (0, import_profiling.__profileResolveHook)(resolved, typeof slot === "symbol" ? slot : void 0) : resolved;
 }
-function nativeLocalHook(name, initialize, dispose, slot) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null)
+function isNativeSignalDiagnosticProbe() {
+  return process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null;
+}
+function nativeLocalHook(name, initialize, dispose, slot, diagnosticInitialize) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null && (name !== "useSignal$" || diagnosticInitialize === void 0 || !(0, import_diagnostic_local_hook.isNativeSignalDiagnosticInitializer)(diagnosticInitialize)))
     throw new PresentationAdoptionMiss(void 0, false);
   slot = resolveSlot(slot);
   if (slot === void 0 || CURRENT_SCOPE === null) missingSlot(name);
   const scope = CURRENT_SCOPE;
   let cell = scope.hooks?.get(slot);
   if (cell === void 0) {
-    cell = { nativeValue: initialize() };
+    cell = {
+      nativeValue: process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null ? diagnosticInitialize() : initialize()
+    };
     ensureHooks(scope).set(slot, cell);
     const value = cell.nativeValue;
     registerHookCleanup(scope, () => dispose(value));
@@ -8941,6 +8952,7 @@ function collectInitialHydrateAttributes(state, snapshot) {
   if (state.seedRaw !== null) hydration.seeds = hydration.parseSeeds(state.seedRaw);
   hydration.protectRootAnchor(end);
   const capture = createOffscreenCapture();
+  const diagnosticNative = state.nativeSeedRaw === void 0 ? void 0 : (0, import_native_read_seeds.createNativeAdoptionState)((0, import_native_read_seeds.parseNativeSignalManifest)(state.nativeSeedRaw));
   const previousHydration = currentHydration;
   const previousCapture = WIP_CAPTURE;
   const previousProbe = hydrateAttributeProbe;
@@ -8960,7 +8972,10 @@ function collectInitialHydrateAttributes(state, snapshot) {
   const previousSelectDefaultSyncs = SELECT_DEFAULT_SYNCS;
   const previousFormChecks = DEV_FORM_CHECKS;
   const previousAutofocus = AUTOFOCUS_QUEUE;
-  const previousNative = (0, import_read_protocol.setNativeAdoptionResolver)(null);
+  const diagnosticDriver = NATIVE_READ_DRIVER;
+  const nativeProbeToken = diagnosticDriver?.pauseLifecycle() ?? -1;
+  const previousWriteGuard = (0, import_read_protocol.beginNativeWriteGuard)();
+  const previousNative = (0, import_read_protocol.setNativeAdoptionResolver)(diagnosticNative?.resolve ?? null);
   const refDetachCheckpoint = refDetachQueue.length;
   currentHydration = hydration;
   WIP_CAPTURE = capture;
@@ -8990,27 +9005,36 @@ function collectInitialHydrateAttributes(state, snapshot) {
       disposeWip({ block, start, end, capture, domParent: wrapper, refDetachCheckpoint });
       drainHydrationRenderPhaseUpdates(block);
     } finally {
-      (0, import_read_protocol.setNativeAdoptionResolver)(previousNative);
-      currentHydration = previousHydration;
-      WIP_CAPTURE = previousCapture;
-      hydrateAttributeProbe = previousProbe;
-      ROOT_RENDER_TRANSACTION = previousTransaction;
-      TRANSITION_JOURNAL = previousJournal;
-      ACTIVE_TRANSITION_ATTEMPT = previousAttempt;
-      SCOPED_READ_TRACKING = previousScopedReadTracking;
-      SCOPED_READS = previousScopedReads;
-      CURRENT_WARM = previousWarm;
-      CURRENT_WARM_CLAIMS = previousWarmClaims;
-      CURRENT_WARM_EPISODE = previousWarmEpisode;
-      ACTIVE_WARM_PLANS.length = 0;
-      ACTIVE_WARM_PLANS.push(...previousWarmPlans);
-      STAGED_DOM = previousStagedDom;
-      STAGED_COMMIT_CAPTURE = previousStagedCapture;
-      PRESENTATION_HYDRATION = previousPresentation;
-      SELECT_SYNCS = previousSelectSyncs;
-      SELECT_DEFAULT_SYNCS = previousSelectDefaultSyncs;
-      DEV_FORM_CHECKS = previousFormChecks;
-      AUTOFOCUS_QUEUE = previousAutofocus;
+      try {
+        diagnosticNative?.release();
+      } finally {
+        try {
+          (0, import_read_protocol.setNativeAdoptionResolver)(previousNative);
+          (0, import_read_protocol.endNativeWriteGuard)(previousWriteGuard);
+          if (nativeProbeToken >= 0) diagnosticDriver.resumeLifecycle(nativeProbeToken);
+        } finally {
+          currentHydration = previousHydration;
+          WIP_CAPTURE = previousCapture;
+          hydrateAttributeProbe = previousProbe;
+          ROOT_RENDER_TRANSACTION = previousTransaction;
+          TRANSITION_JOURNAL = previousJournal;
+          ACTIVE_TRANSITION_ATTEMPT = previousAttempt;
+          SCOPED_READ_TRACKING = previousScopedReadTracking;
+          SCOPED_READS = previousScopedReads;
+          CURRENT_WARM = previousWarm;
+          CURRENT_WARM_CLAIMS = previousWarmClaims;
+          CURRENT_WARM_EPISODE = previousWarmEpisode;
+          ACTIVE_WARM_PLANS.length = 0;
+          ACTIVE_WARM_PLANS.push(...previousWarmPlans);
+          STAGED_DOM = previousStagedDom;
+          STAGED_COMMIT_CAPTURE = previousStagedCapture;
+          PRESENTATION_HYDRATION = previousPresentation;
+          SELECT_SYNCS = previousSelectSyncs;
+          SELECT_DEFAULT_SYNCS = previousSelectDefaultSyncs;
+          DEV_FORM_CHECKS = previousFormChecks;
+          AUTOFOCUS_QUEUE = previousAutofocus;
+        }
+      }
     }
   }
   return probe;
@@ -28735,6 +28759,7 @@ function scriptResource(attrs) {
   isChildrenBlock,
   isHydratingStyle,
   isInActScope,
+  isNativeSignalDiagnosticProbe,
   isValidElement,
   keyedForBlock,
   lazy,

package/dist/cjs/signals/client.cjs

@@ -24,6 +24,7 @@ __export(client_exports, {
 module.exports = __toCommonJS(client_exports);
 __reExport(client_exports, require("./index.cjs"), module.exports);
 var import_runtime = require("../runtime.cjs");
+var import_diagnostic_local_hook = require("./diagnostic-local-hook.cjs");
 var import_engine = require("./engine.cjs");
 function disposeLocalSignal(cell) {
   cell.scope.dispose();
@@ -37,7 +38,11 @@ function useSignal$(initial, slot) {
       return { scope, signal$: scope.signal$("value", value) };
     },
     disposeLocalSignal,
-    slot
+    slot,
+    process.env.NODE_ENV === "production" || typeof initial === "function" || !(0, import_runtime.isNativeSignalDiagnosticProbe)() ? void 0 : (0, import_diagnostic_local_hook.createNativeSignalDiagnosticInitializer)(() => {
+      const scope = (0, import_engine.createDiagnosticLocalScope)("octane/useSignal$");
+      return { scope, signal$: scope.signal$("value", initial) };
+    })
   );
   return cell.signal$;
 }

package/dist/cjs/signals/diagnostic-local-hook.cjs

@@ -0,0 +1,37 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var diagnostic_local_hook_exports = {};
+__export(diagnostic_local_hook_exports, {
+  createNativeSignalDiagnosticInitializer: () => createNativeSignalDiagnosticInitializer,
+  isNativeSignalDiagnosticInitializer: () => isNativeSignalDiagnosticInitializer
+});
+module.exports = __toCommonJS(diagnostic_local_hook_exports);
+const DIAGNOSTIC_SIGNAL_INITIALIZERS = /* @__PURE__ */ new WeakSet();
+function createNativeSignalDiagnosticInitializer(initialize) {
+  DIAGNOSTIC_SIGNAL_INITIALIZERS.add(initialize);
+  return initialize;
+}
+function isNativeSignalDiagnosticInitializer(value) {
+  return DIAGNOSTIC_SIGNAL_INITIALIZERS.has(value);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createNativeSignalDiagnosticInitializer,
+  isNativeSignalDiagnosticInitializer
+});

package/dist/cjs/signals/engine.cjs

@@ -24,6 +24,7 @@ __export(engine_exports, {
   bindScopeStreamedSelection: () => bindScopeStreamedSelection,
   createDeclaredSignalCell: () => createDeclaredSignalCell,
   createDerivedCellWith: () => createDerivedCellWith,
+  createDiagnosticLocalScope: () => createDiagnosticLocalScope,
   createLocalScope: () => createLocalScope,
   createResourceCellWith: () => createResourceCellWith,
   createScope: () => createScope,
@@ -105,6 +106,7 @@ function decodeSeed(scopeKey, seed) {
   }
   return entries;
 }
+const DIAGNOSTIC_LOCAL_SCOPES = /* @__PURE__ */ new WeakSet();
 class ScopeImpl {
   constructor(key, options, seedable = true) {
     this.key = key;
@@ -591,7 +593,8 @@ class ScopeImpl {
   }
   dispose() {
     if (this.disposed) return;
-    (0, import_graph.assertWritable)();
+    if (process.env.NODE_ENV === "production" || !DIAGNOSTIC_LOCAL_SCOPES.has(this))
+      (0, import_graph.assertWritable)();
     (0, import_graph.signalBatch)(() => {
       this.disposed = true;
       this.lifetime++;
@@ -734,6 +737,13 @@ function createScope(options) {
 function createLocalScope(scopeKey) {
   return new ScopeImpl(scopeKey, { scopeKey }, false);
 }
+function createDiagnosticLocalScope(scopeKey) {
+  if (process.env.NODE_ENV === "production" || !(0, import_read_protocol.isNativeWriteGuarded)() || (0, import_read_protocol.getNativeReadObserver)() !== null)
+    throw new import_errors.SignalFrameError("Diagnostic local scopes require an isolated historical read.");
+  const scope = new ScopeImpl(scopeKey, { scopeKey }, false);
+  DIAGNOSTIC_LOCAL_SCOPES.add(scope);
+  return scope;
+}
 function createDeclaredSignalCell(owner, key, initial, preferInitial = false) {
   if (!(owner instanceof ScopeImpl)) throw new TypeError("A direct signal needs an Octane scope.");
   return owner.createSignalDeclaration(key, initial, preferInitial);
@@ -776,6 +786,7 @@ function failScopeStreamedResult(owner, identity, error) {
   bindScopeStreamedSelection,
   createDeclaredSignalCell,
   createDerivedCellWith,
+  createDiagnosticLocalScope,
   createLocalScope,
   createResourceCellWith,
   createScope,

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.4.1";
+const version = "0.4.2";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/runtime.d.ts

@@ -24,6 +24,7 @@ import { validateNativeReadWitness, type NativeReadWitness } from './signals/nat
 import { type NativeReadRetry } from './signals/native-read-retry.js';
 import type { SignalActionFrame } from './signals/transition-action.js';
 import { setNativeAdoptionResolver } from './signals/read-protocol.js';
+import { type DiagnosticSignalInitializer } from './signals/diagnostic-local-hook.js';
 import { type NativeAdoptionState } from './signals/native-read-seeds.js';
 export { documentSignalOwner, installStreamedSignalOwnerActivator, } from './signals/document-owner.js';
 import { type SignalHandle, type SignalOwner, type SignalRendererOwnerIdentity } from './signals/types.js';
@@ -824,8 +825,10 @@ export declare function manualHook<F extends (...args: any[]) => any>(fn: F, nam
 /** Invoke a cached optional-chain method without consulting its call/bind properties. */
 export declare function callWithReceiver<T>(fn: (...args: any[]) => T, receiver: unknown, ...args: any[]): T;
 export declare function withSlot<T>(sym: symbol, fn: (...a: any[]) => T, ...args: any[]): T;
+/** @internal Built-in adapters are allocated only during historical comparison. */
+export declare function isNativeSignalDiagnosticProbe(): boolean;
 /** @internal Optional native hooks use the existing compiler slot and Scope lifetime. */
-export declare function nativeLocalHook<T>(name: string, initialize: () => T, dispose: (value: T) => void, slot?: HookSlot): T;
+export declare function nativeLocalHook<T>(name: string, initialize: () => T, dispose: (value: T) => void, slot?: HookSlot, diagnosticInitialize?: DiagnosticSignalInitializer<T>): T;
 interface StateSlot<T> {
     value: T;
     setter: (next: T | ((prev: T) => T)) => void;

package/dist/runtime.js

@@ -180,9 +180,14 @@ import {
   registerNativeActionResolver,
   runNativeBatch,
   setNativeCandidateResolver,
-  setNativeAdoptionResolver
+  setNativeAdoptionResolver,
+  beginNativeWriteGuard,
+  endNativeWriteGuard
 } from "./signals/read-protocol.js";
 import { beginNativeEventBatch, endNativeEventBatch } from "./signals/native-read-events.js";
+import {
+  isNativeSignalDiagnosticInitializer
+} from "./signals/diagnostic-local-hook.js";
 import {
   createNativeAdoptionState,
   NATIVE_SIGNAL_SEED_ATTR,
@@ -686,12 +691,12 @@ function nativePresentationBinding(owner, slotIndex, el, body, props) {
 }
 function enableNativeReadCollection(abi = 1) {
   if (abi !== 1) throw new Error(formatClientError(58));
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   ensureNativeReadDriver();
 }
 function beginNativeReadScope(scope, abi = 1) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null)
-    throw new PresentationAdoptionMiss(void 0, false);
   if (abi !== 1) throw new Error(formatClientError(58));
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   const block = CURRENT_BLOCK;
   const owner = scope ?? CURRENT_SCOPE;
   if (block === null || owner === null) return -1;
@@ -807,12 +812,14 @@ function endNativeReadScope(token, _completed) {
   if (token >= 0) NATIVE_READ_DRIVER.endScope(token);
 }
 function beginNativeReadWitness(detached = false) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   return detached ? ensureNativeReadDriver().beginWitness(true) : NATIVE_READ_DRIVER?.beginWitness() ?? -1;
 }
 function finishNativeReadWitness(token, completed) {
   return token < 0 ? null : NATIVE_READ_DRIVER.finishWitness(token, completed);
 }
 function replayNativeReadWitness(witness) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   NATIVE_READ_DRIVER?.replay(witness);
 }
 function retainNativeRetryReads(block, reads) {
@@ -6642,7 +6649,8 @@ function renderBlockInner(block) {
   let profileThrown;
   let renderCompleted = false;
   let renderRetry = false;
-  NATIVE_READ_DRIVER?.beginRender(block);
+  if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+    NATIVE_READ_DRIVER?.beginRender(block);
   NATIVE_BLOCK_RETRIES?.get(block)?.clear();
   try {
     if (urgentTransitionRender !== null)
@@ -6710,7 +6718,8 @@ function renderBlockInner(block) {
     CURRENT_SCOPE = prevScope;
     CURRENT_BLOCK = prevBlock;
     try {
-      NATIVE_READ_DRIVER?.endRender(block, renderCompleted, isSuspenseException(profileThrown));
+      if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+        NATIVE_READ_DRIVER?.endRender(block, renderCompleted, isSuspenseException(profileThrown));
     } finally {
       if (urgentTransitionRender !== null)
         urgentTransitionDriver.endUrgent(block, urgentTransitionRender);
@@ -7328,15 +7337,20 @@ function resolveSlot(slot) {
   const resolved = resolveHookPath(slotStack, slot, false);
   return typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ ? __profileResolveHook(resolved, typeof slot === "symbol" ? slot : void 0) : resolved;
 }
-function nativeLocalHook(name, initialize, dispose, slot) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null)
+function isNativeSignalDiagnosticProbe() {
+  return process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null;
+}
+function nativeLocalHook(name, initialize, dispose, slot, diagnosticInitialize) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null && (name !== "useSignal$" || diagnosticInitialize === void 0 || !isNativeSignalDiagnosticInitializer(diagnosticInitialize)))
     throw new PresentationAdoptionMiss(void 0, false);
   slot = resolveSlot(slot);
   if (slot === void 0 || CURRENT_SCOPE === null) missingSlot(name);
   const scope = CURRENT_SCOPE;
   let cell = scope.hooks?.get(slot);
   if (cell === void 0) {
-    cell = { nativeValue: initialize() };
+    cell = {
+      nativeValue: process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null ? diagnosticInitialize() : initialize()
+    };
     ensureHooks(scope).set(slot, cell);
     const value = cell.nativeValue;
     registerHookCleanup(scope, () => dispose(value));
@@ -8794,6 +8808,7 @@ function collectInitialHydrateAttributes(state, snapshot) {
   if (state.seedRaw !== null) hydration.seeds = hydration.parseSeeds(state.seedRaw);
   hydration.protectRootAnchor(end);
   const capture = createOffscreenCapture();
+  const diagnosticNative = state.nativeSeedRaw === void 0 ? void 0 : createNativeAdoptionState(parseNativeSignalManifest(state.nativeSeedRaw));
   const previousHydration = currentHydration;
   const previousCapture = WIP_CAPTURE;
   const previousProbe = hydrateAttributeProbe;
@@ -8813,7 +8828,10 @@ function collectInitialHydrateAttributes(state, snapshot) {
   const previousSelectDefaultSyncs = SELECT_DEFAULT_SYNCS;
   const previousFormChecks = DEV_FORM_CHECKS;
   const previousAutofocus = AUTOFOCUS_QUEUE;
-  const previousNative = setNativeAdoptionResolver(null);
+  const diagnosticDriver = NATIVE_READ_DRIVER;
+  const nativeProbeToken = diagnosticDriver?.pauseLifecycle() ?? -1;
+  const previousWriteGuard = beginNativeWriteGuard();
+  const previousNative = setNativeAdoptionResolver(diagnosticNative?.resolve ?? null);
   const refDetachCheckpoint = refDetachQueue.length;
   currentHydration = hydration;
   WIP_CAPTURE = capture;
@@ -8843,27 +8861,36 @@ function collectInitialHydrateAttributes(state, snapshot) {
       disposeWip({ block, start, end, capture, domParent: wrapper, refDetachCheckpoint });
       drainHydrationRenderPhaseUpdates(block);
     } finally {
-      setNativeAdoptionResolver(previousNative);
-      currentHydration = previousHydration;
-      WIP_CAPTURE = previousCapture;
-      hydrateAttributeProbe = previousProbe;
-      ROOT_RENDER_TRANSACTION = previousTransaction;
-      TRANSITION_JOURNAL = previousJournal;
-      ACTIVE_TRANSITION_ATTEMPT = previousAttempt;
-      SCOPED_READ_TRACKING = previousScopedReadTracking;
-      SCOPED_READS = previousScopedReads;
-      CURRENT_WARM = previousWarm;
-      CURRENT_WARM_CLAIMS = previousWarmClaims;
-      CURRENT_WARM_EPISODE = previousWarmEpisode;
-      ACTIVE_WARM_PLANS.length = 0;
-      ACTIVE_WARM_PLANS.push(...previousWarmPlans);
-      STAGED_DOM = previousStagedDom;
-      STAGED_COMMIT_CAPTURE = previousStagedCapture;
-      PRESENTATION_HYDRATION = previousPresentation;
-      SELECT_SYNCS = previousSelectSyncs;
-      SELECT_DEFAULT_SYNCS = previousSelectDefaultSyncs;
-      DEV_FORM_CHECKS = previousFormChecks;
-      AUTOFOCUS_QUEUE = previousAutofocus;
+      try {
+        diagnosticNative?.release();
+      } finally {
+        try {
+          setNativeAdoptionResolver(previousNative);
+          endNativeWriteGuard(previousWriteGuard);
+          if (nativeProbeToken >= 0) diagnosticDriver.resumeLifecycle(nativeProbeToken);
+        } finally {
+          currentHydration = previousHydration;
+          WIP_CAPTURE = previousCapture;
+          hydrateAttributeProbe = previousProbe;
+          ROOT_RENDER_TRANSACTION = previousTransaction;
+          TRANSITION_JOURNAL = previousJournal;
+          ACTIVE_TRANSITION_ATTEMPT = previousAttempt;
+          SCOPED_READ_TRACKING = previousScopedReadTracking;
+          SCOPED_READS = previousScopedReads;
+          CURRENT_WARM = previousWarm;
+          CURRENT_WARM_CLAIMS = previousWarmClaims;
+          CURRENT_WARM_EPISODE = previousWarmEpisode;
+          ACTIVE_WARM_PLANS.length = 0;
+          ACTIVE_WARM_PLANS.push(...previousWarmPlans);
+          STAGED_DOM = previousStagedDom;
+          STAGED_COMMIT_CAPTURE = previousStagedCapture;
+          PRESENTATION_HYDRATION = previousPresentation;
+          SELECT_SYNCS = previousSelectSyncs;
+          SELECT_DEFAULT_SYNCS = previousSelectDefaultSyncs;
+          DEV_FORM_CHECKS = previousFormChecks;
+          AUTOFOCUS_QUEUE = previousAutofocus;
+        }
+      }
     }
   }
   return probe;
@@ -28596,6 +28623,7 @@ export {
   isChildrenBlock,
   isHydratingStyle,
   isInActScope,
+  isNativeSignalDiagnosticProbe,
   isValidElement,
   keyedForBlock,
   lazy,

package/dist/signals/client.js

@@ -1,6 +1,7 @@
 export * from "./index.js";
-import { nativeLocalHook } from "../runtime.js";
-import { createLocalScope } from "./engine.js";
+import { isNativeSignalDiagnosticProbe, nativeLocalHook } from "../runtime.js";
+import { createNativeSignalDiagnosticInitializer } from "./diagnostic-local-hook.js";
+import { createDiagnosticLocalScope, createLocalScope } from "./engine.js";
 function disposeLocalSignal(cell) {
   cell.scope.dispose();
 }
@@ -13,7 +14,11 @@ function useSignal$(initial, slot) {
       return { scope, signal$: scope.signal$("value", value) };
     },
     disposeLocalSignal,
-    slot
+    slot,
+    process.env.NODE_ENV === "production" || typeof initial === "function" || !isNativeSignalDiagnosticProbe() ? void 0 : createNativeSignalDiagnosticInitializer(() => {
+      const scope = createDiagnosticLocalScope("octane/useSignal$");
+      return { scope, signal$: scope.signal$("value", initial) };
+    })
   );
   return cell.signal$;
 }

package/dist/signals/diagnostic-local-hook.d.ts

@@ -0,0 +1,8 @@
+declare const DIAGNOSTIC_SIGNAL_INITIALIZER: unique symbol;
+export type DiagnosticSignalInitializer<T> = (() => T) & {
+    readonly [DIAGNOSTIC_SIGNAL_INITIALIZER]: true;
+};
+/** @internal Private built-in useSignal$ adapter; not a public native-hook resource factory. */
+export declare function createNativeSignalDiagnosticInitializer<T>(initialize: () => T): DiagnosticSignalInitializer<T>;
+export declare function isNativeSignalDiagnosticInitializer(value: () => unknown): boolean;
+export {};

package/dist/signals/diagnostic-local-hook.js

@@ -0,0 +1,12 @@
+const DIAGNOSTIC_SIGNAL_INITIALIZERS = /* @__PURE__ */ new WeakSet();
+function createNativeSignalDiagnosticInitializer(initialize) {
+  DIAGNOSTIC_SIGNAL_INITIALIZERS.add(initialize);
+  return initialize;
+}
+function isNativeSignalDiagnosticInitializer(value) {
+  return DIAGNOSTIC_SIGNAL_INITIALIZERS.has(value);
+}
+export {
+  createNativeSignalDiagnosticInitializer,
+  isNativeSignalDiagnosticInitializer
+};

package/dist/signals/engine.d.ts

@@ -105,6 +105,8 @@ declare class AdoptionFrameImpl implements AdoptionFrame {
 export declare function createScope(options: ScopeOptions): Scope;
 /** Only the native hook adapter may create a component-owned, non-serializable scope. */
 export declare function createLocalScope(scopeKey: string): Scope;
+/** @internal Isolated historical useSignal$ state, never a live presentation cell. */
+export declare function createDiagnosticLocalScope(scopeKey: string): Scope;
 export declare function createDeclaredSignalCell<T>(owner: Scope, key: string, initial: T, preferInitial?: boolean): WritableSignal<T>;
 export declare function createDerivedCellWith<T>(owner: Scope, key: string, compute: DerivedCompute<T>, options: DerivedOptions | undefined, Binding: DerivedBindingFactory<T>): DerivedSignal<T>;
 export declare function createResourceCellWith<T>(owner: Scope, key: string, describe: () => QueryRequest<T> | typeof skip, initialize: typeof initializeResource, unique?: boolean): Resource<T>;

package/dist/signals/engine.js

@@ -30,6 +30,8 @@ import {
   beginNativeWriteGuard,
   endNativeWriteGuard,
   getNativeAdoptionResolver,
+  getNativeReadObserver,
+  isNativeWriteGuarded,
   registerNativeBatchHooks,
   reportNativeRead
 } from "./read-protocol.js";
@@ -99,6 +101,7 @@ function decodeSeed(scopeKey, seed) {
   }
   return entries;
 }
+const DIAGNOSTIC_LOCAL_SCOPES = /* @__PURE__ */ new WeakSet();
 class ScopeImpl {
   constructor(key, options, seedable = true) {
     this.key = key;
@@ -585,7 +588,8 @@ class ScopeImpl {
   }
   dispose() {
     if (this.disposed) return;
-    assertWritable();
+    if (process.env.NODE_ENV === "production" || !DIAGNOSTIC_LOCAL_SCOPES.has(this))
+      assertWritable();
     signalBatch(() => {
       this.disposed = true;
       this.lifetime++;
@@ -728,6 +732,13 @@ function createScope(options) {
 function createLocalScope(scopeKey) {
   return new ScopeImpl(scopeKey, { scopeKey }, false);
 }
+function createDiagnosticLocalScope(scopeKey) {
+  if (process.env.NODE_ENV === "production" || !isNativeWriteGuarded() || getNativeReadObserver() !== null)
+    throw new SignalFrameError("Diagnostic local scopes require an isolated historical read.");
+  const scope = new ScopeImpl(scopeKey, { scopeKey }, false);
+  DIAGNOSTIC_LOCAL_SCOPES.add(scope);
+  return scope;
+}
 function createDeclaredSignalCell(owner, key, initial, preferInitial = false) {
   if (!(owner instanceof ScopeImpl)) throw new TypeError("A direct signal needs an Octane scope.");
   return owner.createSignalDeclaration(key, initial, preferInitial);
@@ -769,6 +780,7 @@ export {
   bindScopeStreamedSelection,
   createDeclaredSignalCell,
   createDerivedCellWith,
+  createDiagnosticLocalScope,
   createLocalScope,
   createResourceCellWith,
   createScope,

package/dist/version.js

@@ -1,4 +1,4 @@
-const version = "0.4.1";
+const version = "0.4.2";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octane",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "license": "MIT",
   "type": "module",
   "sideEffects": [