@buoy-gg/storage 7.0.33 → 7.0.34

package/lib/commonjs/preset.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createStorageTool = createStorageTool;
-exports.storageToolPreset = void 0;
+exports.storageToolPreset = exports.createStorageTool = void 0;
 var _floatingToolsCore = require("@buoy-gg/floating-tools-core");
+var _sharedUi = require("@buoy-gg/shared-ui");
 var _StorageModalWithTabs = require("./storage/components/StorageModalWithTabs");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
@@ -33,7 +33,7 @@ var _jsxRuntime = require("react/jsx-runtime");
  * - Live storage event monitoring
  * - Required key validation
  */
-const storageToolPreset = exports.storageToolPreset = {
+const storageToolPreset = exports.storageToolPreset = (0, _sharedUi.defineToolPreset)({
   id: "storage",
   name: "STORAGE",
   description: "AsyncStorage browser",
@@ -48,7 +48,7 @@ const storageToolPreset = exports.storageToolPreset = {
     requiredStorageKeys: [],
     enableSharedModalDimensions: false
   }
-};
+});
 
 /**
  * Create a custom AsyncStorage browser tool configuration.
@@ -74,21 +74,7 @@ const storageToolPreset = exports.storageToolPreset = {
  * });
  * ```
  */
-function createStorageTool(options) {
-  return {
-    id: options?.id || "storage",
-    name: options?.name || "STORAGE",
-    description: options?.description || "AsyncStorage browser",
-    slot: "both",
-    icon: ({
-      size
-    }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_floatingToolsCore.StorageIcon, {
-      size: size
-    }),
-    component: _StorageModalWithTabs.StorageModalWithTabs,
-    props: {
-      requiredStorageKeys: options?.requiredStorageKeys || [],
-      enableSharedModalDimensions: options?.enableSharedModalDimensions !== undefined ? options.enableSharedModalDimensions : false
-    }
-  };
-}
+const createStorageTool = exports.createStorageTool = (0, _sharedUi.createToolFactory)(storageToolPreset, options => ({
+  requiredStorageKeys: options.requiredStorageKeys || [],
+  enableSharedModalDimensions: options.enableSharedModalDimensions ?? false
+}));

package/lib/commonjs/storage/components/StorageModalWithTabs.js

@@ -29,6 +29,41 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * because it is part of the package's public exports.
  */
 const FREE_TIER_EVENT_LIMIT = exports.FREE_TIER_EVENT_LIMIT = _sharedUi.TIER_LIMITS["storage.events"].free;
+/**
+ * Persistence recipes. These keys were always written straight to
+ * AsyncStorage (not the FileSystem-first persistentStorage), so they keep
+ * that backend — a user's saved tab, filters and pins survive the upgrade.
+ */
+const ASYNC_STORAGE_BACKEND = {
+  getItem: key => _asyncStorage.default.getItem(key),
+  setItem: (key, value) => _asyncStorage.default.setItem(key, value)
+};
+const TAB_PERSISTENCE = {
+  storage: ASYNC_STORAGE_BACKEND,
+  // Stored as the bare tab name, not JSON.
+  parse: raw => raw === "browser" || raw === "events" ? raw : undefined,
+  serialize: tab => tab
+};
+const BOOLEAN_PERSISTENCE = {
+  storage: ASYNC_STORAGE_BACKEND,
+  // Stored as "true" / "false".
+  parse: raw => raw === "true",
+  serialize: value => value.toString()
+};
+const STRING_SET_PERSISTENCE = {
+  storage: ASYNC_STORAGE_BACKEND,
+  parse: raw => new Set(JSON.parse(raw)),
+  serialize: set => JSON.stringify(Array.from(set))
+};
+const IGNORED_PATTERNS_PERSISTENCE = {
+  ...STRING_SET_PERSISTENCE,
+  parse: raw => {
+    const filters = JSON.parse(raw);
+    // Always ensure @react_buoy is included to hide dev tool keys
+    if (!filters.includes("@react_buoy")) filters.push("@react_buoy");
+    return new Set(filters);
+  }
+};
 function StorageModalWithTabs({
   visible,
   onClose,
@@ -43,7 +78,7 @@ function StorageModalWithTabs({
 }) {
   const isPro = (0, _license.useIsPro)();
   const eventLimit = (0, _sharedUi.useLimit)("storage.events");
-  const [activeTab, setActiveTab] = (0, _react.useState)("browser");
+  const [activeTab, setActiveTab] = (0, _sharedUi.usePersistedState)(_sharedUi.devToolsStorageKeys.storage.activeTab(), "browser", TAB_PERSISTENCE);
   (0, _react.useEffect)(() => {
     onTabChange?.(activeTab);
   }, [activeTab, onTabChange]);
@@ -59,7 +94,7 @@ function StorageModalWithTabs({
   const [isSearchActive, setIsSearchActive] = (0, _react.useState)(false);
 
   // Local state to control subscription (true = subscribed, false = unsubscribed)
-  const [isListeningEnabled, setIsListeningEnabled] = (0, _react.useState)(true);
+  const [isListeningEnabled, setIsListeningEnabled] = (0, _sharedUi.usePersistedState)(_sharedUi.devToolsStorageKeys.storage.isMonitoring(), true, BOOLEAN_PERSISTENCE);
 
   // Event Listener state - using centralized store via hook
   // Pass enabled option to control subscription - this allows events tool to
@@ -76,8 +111,9 @@ function StorageModalWithTabs({
   const [selectedHistoryEventIndex, setSelectedHistoryEventIndex] = (0, _react.useState)(null);
   const [selectedEventIndex, setSelectedEventIndex] = (0, _react.useState)(0);
   const [showFilters, setShowFilters] = (0, _react.useState)(false);
-  const [ignoredPatterns, setIgnoredPatterns] = (0, _react.useState)(new Set(["@react_buoy", "@RNAsyncStorage", "redux-persist", "persist:"]) // Auto-hide dev tool keys by default
-  );
+  const [ignoredPatterns, setIgnoredPatterns] = (0, _sharedUi.usePersistedState)(_sharedUi.devToolsStorageKeys.storage.eventFilters(),
+  // Auto-hide dev tool keys by default
+  new Set(["@react_buoy", "@RNAsyncStorage", "redux-persist", "persist:"]), IGNORED_PATTERNS_PERSISTENCE);
   /**
    * Which backend both tabs are looking at.
    *
@@ -93,12 +129,8 @@ function StorageModalWithTabs({
   const [storageTypeFilter, setStorageTypeFilter] = (0, _react.useState)("all");
   const [enabledStorageTypes, setEnabledStorageTypes] = (0, _react.useState)(new Set(['async', 'mmkv', 'secure']) // All enabled by default
   );
-  const [pinnedKeys, setPinnedKeys] = (0, _react.useState)(new Set());
+  const [pinnedKeys, setPinnedKeys] = (0, _sharedUi.usePersistedState)(_sharedUi.devToolsStorageKeys.storage.pinnedKeys(), new Set(), STRING_SET_PERSISTENCE);
   const lastEventRef = (0, _react.useRef)(null);
-  const hasLoadedFilters = (0, _react.useRef)(false);
-  const hasLoadedPins = (0, _react.useRef)(false);
-  const hasLoadedTabState = (0, _react.useRef)(false);
-  const hasLoadedMonitoringState = (0, _react.useRef)(false);
 
   // isListening = enabled and capturing (has subscribers)
   const isListening = isListeningEnabled && isCapturing;
@@ -113,140 +145,6 @@ function StorageModalWithTabs({
 
   // Timer removed - using useTickEveryMinute hook instead
 
-  // Load persisted tab state on mount
-  (0, _react.useEffect)(() => {
-    if (!visible || hasLoadedTabState.current) return;
-    const loadTabState = async () => {
-      try {
-        const storedTab = await _asyncStorage.default.getItem(_sharedUi.devToolsStorageKeys.storage.activeTab());
-        if (storedTab && (storedTab === "browser" || storedTab === "events")) {
-          setActiveTab(storedTab);
-        }
-        hasLoadedTabState.current = true;
-      } catch (error) {
-        // Failed to load tab state
-      }
-    };
-    loadTabState();
-  }, [visible]);
-
-  // Load persisted monitoring state on mount
-  (0, _react.useEffect)(() => {
-    if (!visible || hasLoadedMonitoringState.current) return;
-    const loadMonitoringState = async () => {
-      try {
-        const storedMonitoring = await _asyncStorage.default.getItem(_sharedUi.devToolsStorageKeys.storage.isMonitoring());
-        if (storedMonitoring !== null) {
-          const shouldMonitor = storedMonitoring === "true";
-          setIsListeningEnabled(shouldMonitor);
-        }
-        hasLoadedMonitoringState.current = true;
-      } catch (error) {
-        // Failed to load monitoring state
-      }
-    };
-    loadMonitoringState();
-  }, [visible]);
-
-  // Note: Conversations will appear when storage events are triggered
-  // Click on any conversation to see the unified view with toggle cards
-
-  // Save tab state when it changes
-  (0, _react.useEffect)(() => {
-    if (!hasLoadedTabState.current) return; // Don't save on initial load
-
-    const saveTabState = async () => {
-      try {
-        await _asyncStorage.default.setItem(_sharedUi.devToolsStorageKeys.storage.activeTab(), activeTab);
-      } catch (error) {
-        // Failed to save tab state
-      }
-    };
-    saveTabState();
-  }, [activeTab]);
-
-  // Save monitoring state when it changes
-  (0, _react.useEffect)(() => {
-    if (!hasLoadedMonitoringState.current) return; // Don't save on initial load
-
-    const saveMonitoringState = async () => {
-      try {
-        await _asyncStorage.default.setItem(_sharedUi.devToolsStorageKeys.storage.isMonitoring(), isListening.toString());
-      } catch (error) {
-        // Failed to save monitoring state
-      }
-    };
-    saveMonitoringState();
-  }, [isListening]);
-
-  // Load persisted filters on mount
-  (0, _react.useEffect)(() => {
-    if (!visible || hasLoadedFilters.current) return;
-    const loadFilters = async () => {
-      try {
-        const storedFilters = await _asyncStorage.default.getItem(_sharedUi.devToolsStorageKeys.storage.eventFilters());
-        if (storedFilters) {
-          const filters = JSON.parse(storedFilters);
-          // Always ensure @react_buoy is included to hide dev tool keys
-          if (!filters.includes("@react_buoy")) {
-            filters.push("@react_buoy");
-          }
-          setIgnoredPatterns(new Set(filters));
-        }
-        hasLoadedFilters.current = true;
-      } catch (error) {
-        // Failed to load filters
-      }
-    };
-    loadFilters();
-  }, [visible]);
-
-  // Save filters when they change
-  (0, _react.useEffect)(() => {
-    if (!hasLoadedFilters.current) return; // Don't save on initial load
-
-    const saveFilters = async () => {
-      try {
-        const filters = Array.from(ignoredPatterns);
-        await _asyncStorage.default.setItem(_sharedUi.devToolsStorageKeys.storage.eventFilters(), JSON.stringify(filters));
-      } catch (error) {
-        // Failed to save filters
-      }
-    };
-    saveFilters();
-  }, [ignoredPatterns]);
-
-  // Load persisted pinned keys on mount
-  (0, _react.useEffect)(() => {
-    if (!visible || hasLoadedPins.current) return;
-    const loadPins = async () => {
-      try {
-        const stored = await _asyncStorage.default.getItem(_sharedUi.devToolsStorageKeys.storage.pinnedKeys());
-        if (stored) {
-          setPinnedKeys(new Set(JSON.parse(stored)));
-        }
-        hasLoadedPins.current = true;
-      } catch (error) {
-        // Failed to load pinned keys
-      }
-    };
-    loadPins();
-  }, [visible]);
-
-  // Save pinned keys when they change
-  (0, _react.useEffect)(() => {
-    if (!hasLoadedPins.current) return; // Don't save on initial load
-
-    const savePins = async () => {
-      try {
-        await _asyncStorage.default.setItem(_sharedUi.devToolsStorageKeys.storage.pinnedKeys(), JSON.stringify(Array.from(pinnedKeys)));
-      } catch (error) {
-        // Failed to save pinned keys
-      }
-    };
-    savePins();
-  }, [pinnedKeys]);
-
   // Event listener setup - now handled by useStorageEvents hook
   // The hook subscribes to the centralized storageEventStore
 

package/lib/commonjs/storage/hooks/useStorageEvents.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useStorageEvents = useStorageEvents;
 var _react = require("react");
+var _sharedUi = require("@buoy-gg/shared-ui");
 var _storageEventStore = require("../stores/storageEventStore");
 /**
  * useStorageEvents Hook
@@ -39,60 +40,22 @@ function useStorageEvents(options = {}) {
     maxEvents = 500,
     enabled = true
   } = options;
-  const [events, setEvents] = (0, _react.useState)([]);
-  // Track capturing state locally so it updates reactively with the subscription
-  const [isCapturing, setIsCapturing] = (0, _react.useState)(enabled);
-
-  // Subscribe to store - this automatically starts/stops the storage listener
-  // based on subscriber count (Subscribable pattern from TanStack Query)
-  // Only subscribe when enabled is true
-  (0, _react.useEffect)(() => {
-    if (!enabled) {
-      setIsCapturing(false);
-      return;
-    }
-
-    // Frame-coalesced (same pattern as network's useNetworkEventList):
-    // bursts of storage writes land as ONE commit per frame instead of
-    // one per emission — the dominant live-churn cost measured on the
-    // network tool (tool-bench 2026-07-06).
-    let rafId = null;
-    let pending = null;
-    const unsubscribe = _storageEventStore.storageEventStore.subscribeToEvents(allEvents => {
-      pending = allEvents;
-      if (rafId != null) return;
-      rafId = requestAnimationFrame(() => {
-        rafId = null;
-        if (!pending) return;
-        // Filter by storage type if specified
-        let filtered = pending;
-        pending = null;
-        if (storageType !== "all") {
-          filtered = filtered.filter(e => e.storageType === storageType);
-        }
-        // Limit events
-        if (filtered.length > maxEvents) {
-          filtered = filtered.slice(0, maxEvents);
-        }
-        setEvents(filtered);
-      });
-    });
-
-    // Mark as capturing after successful subscription
-    setIsCapturing(true);
-    return () => {
-      unsubscribe();
-      if (rafId != null) cancelAnimationFrame(rafId);
-      // Note: Don't set isCapturing=false here because we might be
-      // re-subscribing due to dependency change, not actually stopping
-    };
-  }, [storageType, maxEvents, enabled]);
-  const clearEvents = (0, _react.useCallback)(() => {
-    _storageEventStore.storageEventStore.clearEvents();
-  }, []);
+  // Stable per storageType so the shared hook doesn't resubscribe every render.
+  const select = (0, _react.useMemo)(() => storageType === "all" ? undefined : events => events.filter(e => e.storageType === storageType), [storageType]);
+  // Subscribing auto-starts the storage listener (Subscribable pattern), and
+  // the shared hook frame-coalesces write bursts into one commit.
+  const {
+    events,
+    clearEvents,
+    isActive
+  } = (0, _sharedUi.useEventStoreEvents)(_storageEventStore.storageEventStore, {
+    maxEvents,
+    enabled,
+    select
+  });
   return {
     events,
     clearEvents,
-    isCapturing
+    isCapturing: isActive
   };
 }

package/lib/commonjs/storage/utils/snapshotProvider.js

@@ -108,24 +108,12 @@ async function capture() {
 }
 async function restore(data, options) {
   const snapshot = data;
-  const excludedSet = new Set(options?.excludeKeys ?? []);
-  const includedSet = options?.includeKeys ? new Set(options.includeKeys) : null;
+  const scope = (0, _sharedUi.createRestoreScope)(options);
   /** True when this item may be touched (scope + exclusions agree). */
-  const touch = key => !excludedSet.has(key) && (!includedSet || includedSet.has(key));
-  let excludedHits = 0;
-  const result = {
-    ok: true,
-    applied: 0,
-    skipped: [],
-    warnings: []
-  };
+  const touch = scope.touch;
+  const result = (0, _sharedUi.emptyRestoreResult)();
   if (!snapshot) {
-    return {
-      ok: false,
-      applied: 0,
-      skipped: [],
-      warnings: ["empty storage snapshot"]
-    };
+    return (0, _sharedUi.failedRestore)("empty storage snapshot");
   }
 
   // ── AsyncStorage: delete app keys missing from the snapshot, write the rest ──
@@ -134,7 +122,7 @@ async function restore(data, options) {
     const snapKeys = new Set(snapPairs.map(([k]) => k));
     const liveKeys = (await _asyncStorage.default.getAllKeys()).filter(k => !(0, _sharedUi.isDevToolsStorageKey)(k));
     const toRemove = liveKeys.filter(k => !snapKeys.has(k) && touch(`async:${k}`));
-    excludedHits += (snapshot.async ?? []).length - snapPairs.length;
+    scope.countExcluded((snapshot.async ?? []).length - snapPairs.length);
     if (toRemove.length > 0) await (0, _asyncStorageCompat.removeMany)(toRemove);
     if (snapPairs.length > 0) await (0, _asyncStorageCompat.writeMany)(snapPairs);
     result.applied += snapPairs.length + toRemove.length;
@@ -167,10 +155,7 @@ async function restore(data, options) {
       const snapKeys = new Set(entries.map(e => e.key));
       const liveKeys = instance.getAllKeys().filter(key => !(0, _sharedUi.isDevToolsStorageKey)(key));
       for (const key of liveKeys) {
-        if (!touch(`mmkv:${id}/${key}`)) {
-          excludedHits += 1;
-          continue;
-        }
+        if (!scope.allows(`mmkv:${id}/${key}`)) continue;
         if (!snapKeys.has(key)) {
           deleteMMKVKey(instance, key);
           result.applied += 1;
@@ -201,10 +186,7 @@ async function restore(data, options) {
     key,
     options
   } of _SecureStoreRegistry.secureStoreRegistry.getAll()) {
-    if (!touch(`secure:${key}`)) {
-      excludedHits += 1;
-      continue;
-    }
+    if (!scope.allows(`secure:${key}`)) continue;
     if (options.requireAuthentication) {
       if (key in secureSnap) {
         result.skipped.push({
@@ -237,20 +219,14 @@ async function restore(data, options) {
       });
     }
   }
-  if (excludedHits > 0) {
-    result.warnings.push(`${excludedHits} item(s) excluded by you`);
-  }
+  const excludedWarning = scope.excludedWarning("item(s)");
+  if (excludedWarning) result.warnings.push(excludedWarning);
   return result;
 }
 
 /** Wipe to fresh-install state (Buoy keys preserved). Used by baseline restore. */
 async function clear() {
-  const result = {
-    ok: true,
-    applied: 0,
-    skipped: [],
-    warnings: []
-  };
+  const result = (0, _sharedUi.emptyRestoreResult)();
   try {
     await (0, _clearAllStorage.clearAllAppStorage)();
     result.applied += 1;
@@ -301,40 +277,24 @@ async function clear() {
   return result;
 }
 const ITEM_RENDER_CHAR_LIMIT = 256 * 1024;
+
+/**
+ * Storage values are strings (or MMKV primitives): identity equality and a
+ * character-length size gate are the right tests, not a deep walk.
+ */
 function classifyValue(key, label, oldValue, newValue, inOld, inNew) {
-  if (!inNew) return {
+  return (0, _sharedUi.classifyPreviewItem)({
     key,
     label,
-    verdict: "removed",
-    oldValue
-  };
-  if (!inOld) return {
-    key,
-    label,
-    verdict: "added",
-    newValue
-  };
-  if (Object.is(oldValue, newValue)) return {
-    key,
-    label,
-    verdict: "unchanged"
-  };
-  const tooLarge = typeof oldValue === "string" && oldValue.length > ITEM_RENDER_CHAR_LIMIT || typeof newValue === "string" && newValue.length > ITEM_RENDER_CHAR_LIMIT;
-  if (tooLarge) {
-    return {
-      key,
-      label,
-      verdict: "too-large",
-      reason: "value too large to render a diff — restore still applies it"
-    };
-  }
-  return {
-    key,
-    label,
-    verdict: "changed",
     oldValue,
-    newValue
-  };
+    newValue,
+    inOld,
+    inNew
+  }, {
+    equal: Object.is,
+    tooLarge: value => typeof value === "string" && value.length > ITEM_RENDER_CHAR_LIMIT,
+    tooLargeReason: "value too large to render a diff — restore still applies it"
+  });
 }
 
 /** Per-key restore preview across all three backends. */
@@ -356,46 +316,31 @@ async function previewItems(target, base) {
   // ── AsyncStorage ──
   const oldAsync = new Map(baseData.async ?? []);
   const newAsync = new Map(targetData.async ?? []);
-  for (const key of new Set([...oldAsync.keys(), ...newAsync.keys()])) {
+  for (const key of (0, _sharedUi.unionKeys)(oldAsync, newAsync)) {
     if ((0, _sharedUi.isDevToolsStorageKey)(key)) continue;
     items.push(classifyValue(`async:${key}`, key, oldAsync.get(key), newAsync.get(key), oldAsync.has(key), newAsync.has(key)));
   }
 
   // ── MMKV ──
-  const instanceIds = new Set([...Object.keys(baseData.mmkv ?? {}), ...Object.keys(targetData.mmkv ?? {})]);
-  for (const id of instanceIds) {
+  for (const id of (0, _sharedUi.unionKeys)(baseData.mmkv, targetData.mmkv)) {
     const registered = liveMode ? _MMKVInstanceRegistry.mmkvInstanceRegistry.get(id) : null;
     const instanceUnavailable = liveMode && !registered;
     const readOnly = liveMode && registered?.instance.isReadOnly === true;
     const oldEntries = new Map((baseData.mmkv?.[id] ?? []).map(e => [e.key, e]));
     const newEntries = new Map((targetData.mmkv?.[id] ?? []).map(e => [e.key, e]));
-    for (const key of new Set([...oldEntries.keys(), ...newEntries.keys()])) {
+    for (const key of (0, _sharedUi.unionKeys)(oldEntries, newEntries)) {
       if ((0, _sharedUi.isDevToolsStorageKey)(key)) continue;
       const itemKey = `mmkv:${id}/${key}`;
       const label = `${id} · ${key}`;
       const oldE = oldEntries.get(key);
       const newE = newEntries.get(key);
       let item = classifyValue(itemKey, label, oldE?.value, newE?.value, oldEntries.has(key), newEntries.has(key));
-      if (item.verdict !== "unchanged") {
-        if (instanceUnavailable) {
-          item = {
-            ...item,
-            verdict: "wont-apply",
-            reason: "MMKV instance not registered"
-          };
-        } else if (readOnly) {
-          item = {
-            ...item,
-            verdict: "wont-apply",
-            reason: "MMKV instance registered read-only"
-          };
-        } else if (newE?.valueType === "buffer" || oldE?.valueType === "buffer") {
-          item = {
-            ...item,
-            verdict: "wont-apply",
-            reason: "ArrayBuffer values cannot be restored"
-          };
-        }
+      if (instanceUnavailable) {
+        item = (0, _sharedUi.wontApply)(item, "MMKV instance not registered");
+      } else if (readOnly) {
+        item = (0, _sharedUi.wontApply)(item, "MMKV instance registered read-only");
+      } else if (newE?.valueType === "buffer" || oldE?.valueType === "buffer") {
+        item = (0, _sharedUi.wontApply)(item, "ArrayBuffer values cannot be restored");
       }
       items.push(item);
     }
@@ -405,22 +350,14 @@ async function previewItems(target, base) {
   const oldSecure = baseData.secure ?? {};
   const newSecure = targetData.secure ?? {};
   const registeredSecure = liveMode ? new Map(_SecureStoreRegistry.secureStoreRegistry.getAll().map(e => [e.key, e])) : null;
-  for (const key of new Set([...Object.keys(oldSecure), ...Object.keys(newSecure)])) {
+  for (const key of (0, _sharedUi.unionKeys)(oldSecure, newSecure)) {
     let item = classifyValue(`secure:${key}`, key, oldSecure[key], newSecure[key], key in oldSecure, key in newSecure);
-    if (liveMode && item.verdict !== "unchanged") {
+    if (liveMode) {
       const entry = registeredSecure?.get(key);
       if (!entry) {
-        item = {
-          ...item,
-          verdict: "wont-apply",
-          reason: "key no longer registered with registerSecureStoreKeys"
-        };
+        item = (0, _sharedUi.wontApply)(item, "key no longer registered with registerSecureStoreKeys");
       } else if (entry.options.requireAuthentication) {
-        item = {
-          ...item,
-          verdict: "wont-apply",
-          reason: "biometric-protected keys are never written"
-        };
+        item = (0, _sharedUi.wontApply)(item, "biometric-protected keys are never written");
       }
     }
     items.push(item);

package/lib/module/preset.js

@@ -18,6 +18,7 @@
  */
 
 import { StorageIcon } from "@buoy-gg/floating-tools-core";
+import { createToolFactory, defineToolPreset } from "@buoy-gg/shared-ui";
 import { StorageModalWithTabs } from "./storage/components/StorageModalWithTabs";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -28,7 +29,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * - Live storage event monitoring
  * - Required key validation
  */
-export const storageToolPreset = {
+export const storageToolPreset = defineToolPreset({
   id: "storage",
   name: "STORAGE",
   description: "AsyncStorage browser",
@@ -43,7 +44,7 @@ export const storageToolPreset = {
     requiredStorageKeys: [],
     enableSharedModalDimensions: false
   }
-};
+});
 
 /**
  * Create a custom AsyncStorage browser tool configuration.
@@ -69,21 +70,7 @@ export const storageToolPreset = {
  * });
  * ```
  */
-export function createStorageTool(options) {
-  return {
-    id: options?.id || "storage",
-    name: options?.name || "STORAGE",
-    description: options?.description || "AsyncStorage browser",
-    slot: "both",
-    icon: ({
-      size
-    }) => /*#__PURE__*/_jsx(StorageIcon, {
-      size: size
-    }),
-    component: StorageModalWithTabs,
-    props: {
-      requiredStorageKeys: options?.requiredStorageKeys || [],
-      enableSharedModalDimensions: options?.enableSharedModalDimensions !== undefined ? options.enableSharedModalDimensions : false
-    }
-  };
-}
+export const createStorageTool = createToolFactory(storageToolPreset, options => ({
+  requiredStorageKeys: options.requiredStorageKeys || [],
+  enableSharedModalDimensions: options.enableSharedModalDimensions ?? false
+}));

package/lib/module/storage/components/StorageModalWithTabs.js

@@ -3,7 +3,7 @@
 import { useState, useCallback, useEffect, useRef, useMemo } from "react";
 import { View, TouchableOpacity, StyleSheet, FlatList, Alert } from "react-native";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { JsModal, ModalHeader, TabSelector, parseValue, devToolsStorageKeys, macOSColors, night, ToolEmptyState, Filter, RefreshCw, Search, SearchBar, PowerToggleButton, ToolbarCopyButton, ToolbarClearButton, truncatePayload, TickProvider, useLimit, TIER_LIMITS, windowDragProps } from "@buoy-gg/shared-ui";
+import { JsModal, ModalHeader, TabSelector, parseValue, devToolsStorageKeys, macOSColors, night, ToolEmptyState, Filter, RefreshCw, Search, SearchBar, PowerToggleButton, ToolbarCopyButton, ToolbarClearButton, truncatePayload, TickProvider, useLimit, TIER_LIMITS, windowDragProps, usePersistedState } from "@buoy-gg/shared-ui";
 import { StorageBrowserMode } from "./StorageBrowserMode";
 import { StorageTypeFilterBar, countByStorageType } from "./StorageTypeFilterBar";
 import { clearAllAppStorage, clearAllStorageIncludingDevTools } from "../utils/clearAllStorage";
@@ -24,6 +24,41 @@ import { useIsPro } from "@buoy-gg/license";
  */
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export const FREE_TIER_EVENT_LIMIT = TIER_LIMITS["storage.events"].free;
+/**
+ * Persistence recipes. These keys were always written straight to
+ * AsyncStorage (not the FileSystem-first persistentStorage), so they keep
+ * that backend — a user's saved tab, filters and pins survive the upgrade.
+ */
+const ASYNC_STORAGE_BACKEND = {
+  getItem: key => AsyncStorage.getItem(key),
+  setItem: (key, value) => AsyncStorage.setItem(key, value)
+};
+const TAB_PERSISTENCE = {
+  storage: ASYNC_STORAGE_BACKEND,
+  // Stored as the bare tab name, not JSON.
+  parse: raw => raw === "browser" || raw === "events" ? raw : undefined,
+  serialize: tab => tab
+};
+const BOOLEAN_PERSISTENCE = {
+  storage: ASYNC_STORAGE_BACKEND,
+  // Stored as "true" / "false".
+  parse: raw => raw === "true",
+  serialize: value => value.toString()
+};
+const STRING_SET_PERSISTENCE = {
+  storage: ASYNC_STORAGE_BACKEND,
+  parse: raw => new Set(JSON.parse(raw)),
+  serialize: set => JSON.stringify(Array.from(set))
+};
+const IGNORED_PATTERNS_PERSISTENCE = {
+  ...STRING_SET_PERSISTENCE,
+  parse: raw => {
+    const filters = JSON.parse(raw);
+    // Always ensure @react_buoy is included to hide dev tool keys
+    if (!filters.includes("@react_buoy")) filters.push("@react_buoy");
+    return new Set(filters);
+  }
+};
 export function StorageModalWithTabs({
   visible,
   onClose,
@@ -38,7 +73,7 @@ export function StorageModalWithTabs({
 }) {
   const isPro = useIsPro();
   const eventLimit = useLimit("storage.events");
-  const [activeTab, setActiveTab] = useState("browser");
+  const [activeTab, setActiveTab] = usePersistedState(devToolsStorageKeys.storage.activeTab(), "browser", TAB_PERSISTENCE);
   useEffect(() => {
     onTabChange?.(activeTab);
   }, [activeTab, onTabChange]);
@@ -54,7 +89,7 @@ export function StorageModalWithTabs({
   const [isSearchActive, setIsSearchActive] = useState(false);
 
   // Local state to control subscription (true = subscribed, false = unsubscribed)
-  const [isListeningEnabled, setIsListeningEnabled] = useState(true);
+  const [isListeningEnabled, setIsListeningEnabled] = usePersistedState(devToolsStorageKeys.storage.isMonitoring(), true, BOOLEAN_PERSISTENCE);
 
   // Event Listener state - using centralized store via hook
   // Pass enabled option to control subscription - this allows events tool to
@@ -71,8 +106,9 @@ export function StorageModalWithTabs({
   const [selectedHistoryEventIndex, setSelectedHistoryEventIndex] = useState(null);
   const [selectedEventIndex, setSelectedEventIndex] = useState(0);
   const [showFilters, setShowFilters] = useState(false);
-  const [ignoredPatterns, setIgnoredPatterns] = useState(new Set(["@react_buoy", "@RNAsyncStorage", "redux-persist", "persist:"]) // Auto-hide dev tool keys by default
-  );
+  const [ignoredPatterns, setIgnoredPatterns] = usePersistedState(devToolsStorageKeys.storage.eventFilters(),
+  // Auto-hide dev tool keys by default
+  new Set(["@react_buoy", "@RNAsyncStorage", "redux-persist", "persist:"]), IGNORED_PATTERNS_PERSISTENCE);
   /**
    * Which backend both tabs are looking at.
    *
@@ -88,12 +124,8 @@ export function StorageModalWithTabs({
   const [storageTypeFilter, setStorageTypeFilter] = useState("all");
   const [enabledStorageTypes, setEnabledStorageTypes] = useState(new Set(['async', 'mmkv', 'secure']) // All enabled by default
   );
-  const [pinnedKeys, setPinnedKeys] = useState(new Set());
+  const [pinnedKeys, setPinnedKeys] = usePersistedState(devToolsStorageKeys.storage.pinnedKeys(), new Set(), STRING_SET_PERSISTENCE);
   const lastEventRef = useRef(null);
-  const hasLoadedFilters = useRef(false);
-  const hasLoadedPins = useRef(false);
-  const hasLoadedTabState = useRef(false);
-  const hasLoadedMonitoringState = useRef(false);
 
   // isListening = enabled and capturing (has subscribers)
   const isListening = isListeningEnabled && isCapturing;
@@ -108,140 +140,6 @@ export function StorageModalWithTabs({
 
   // Timer removed - using useTickEveryMinute hook instead
 
-  // Load persisted tab state on mount
-  useEffect(() => {
-    if (!visible || hasLoadedTabState.current) return;
-    const loadTabState = async () => {
-      try {
-        const storedTab = await AsyncStorage.getItem(devToolsStorageKeys.storage.activeTab());
-        if (storedTab && (storedTab === "browser" || storedTab === "events")) {
-          setActiveTab(storedTab);
-        }
-        hasLoadedTabState.current = true;
-      } catch (error) {
-        // Failed to load tab state
-      }
-    };
-    loadTabState();
-  }, [visible]);
-
-  // Load persisted monitoring state on mount
-  useEffect(() => {
-    if (!visible || hasLoadedMonitoringState.current) return;
-    const loadMonitoringState = async () => {
-      try {
-        const storedMonitoring = await AsyncStorage.getItem(devToolsStorageKeys.storage.isMonitoring());
-        if (storedMonitoring !== null) {
-          const shouldMonitor = storedMonitoring === "true";
-          setIsListeningEnabled(shouldMonitor);
-        }
-        hasLoadedMonitoringState.current = true;
-      } catch (error) {
-        // Failed to load monitoring state
-      }
-    };
-    loadMonitoringState();
-  }, [visible]);
-
-  // Note: Conversations will appear when storage events are triggered
-  // Click on any conversation to see the unified view with toggle cards
-
-  // Save tab state when it changes
-  useEffect(() => {
-    if (!hasLoadedTabState.current) return; // Don't save on initial load
-
-    const saveTabState = async () => {
-      try {
-        await AsyncStorage.setItem(devToolsStorageKeys.storage.activeTab(), activeTab);
-      } catch (error) {
-        // Failed to save tab state
-      }
-    };
-    saveTabState();
-  }, [activeTab]);
-
-  // Save monitoring state when it changes
-  useEffect(() => {
-    if (!hasLoadedMonitoringState.current) return; // Don't save on initial load
-
-    const saveMonitoringState = async () => {
-      try {
-        await AsyncStorage.setItem(devToolsStorageKeys.storage.isMonitoring(), isListening.toString());
-      } catch (error) {
-        // Failed to save monitoring state
-      }
-    };
-    saveMonitoringState();
-  }, [isListening]);
-
-  // Load persisted filters on mount
-  useEffect(() => {
-    if (!visible || hasLoadedFilters.current) return;
-    const loadFilters = async () => {
-      try {
-        const storedFilters = await AsyncStorage.getItem(devToolsStorageKeys.storage.eventFilters());
-        if (storedFilters) {
-          const filters = JSON.parse(storedFilters);
-          // Always ensure @react_buoy is included to hide dev tool keys
-          if (!filters.includes("@react_buoy")) {
-            filters.push("@react_buoy");
-          }
-          setIgnoredPatterns(new Set(filters));
-        }
-        hasLoadedFilters.current = true;
-      } catch (error) {
-        // Failed to load filters
-      }
-    };
-    loadFilters();
-  }, [visible]);
-
-  // Save filters when they change
-  useEffect(() => {
-    if (!hasLoadedFilters.current) return; // Don't save on initial load
-
-    const saveFilters = async () => {
-      try {
-        const filters = Array.from(ignoredPatterns);
-        await AsyncStorage.setItem(devToolsStorageKeys.storage.eventFilters(), JSON.stringify(filters));
-      } catch (error) {
-        // Failed to save filters
-      }
-    };
-    saveFilters();
-  }, [ignoredPatterns]);
-
-  // Load persisted pinned keys on mount
-  useEffect(() => {
-    if (!visible || hasLoadedPins.current) return;
-    const loadPins = async () => {
-      try {
-        const stored = await AsyncStorage.getItem(devToolsStorageKeys.storage.pinnedKeys());
-        if (stored) {
-          setPinnedKeys(new Set(JSON.parse(stored)));
-        }
-        hasLoadedPins.current = true;
-      } catch (error) {
-        // Failed to load pinned keys
-      }
-    };
-    loadPins();
-  }, [visible]);
-
-  // Save pinned keys when they change
-  useEffect(() => {
-    if (!hasLoadedPins.current) return; // Don't save on initial load
-
-    const savePins = async () => {
-      try {
-        await AsyncStorage.setItem(devToolsStorageKeys.storage.pinnedKeys(), JSON.stringify(Array.from(pinnedKeys)));
-      } catch (error) {
-        // Failed to save pinned keys
-      }
-    };
-    savePins();
-  }, [pinnedKeys]);
-
   // Event listener setup - now handled by useStorageEvents hook
   // The hook subscribes to the centralized storageEventStore
 

package/lib/module/storage/hooks/useStorageEvents.js

@@ -25,7 +25,8 @@
  * ```
  */
 
-import { useState, useEffect, useCallback } from "react";
+import { useMemo } from "react";
+import { useEventStoreEvents } from "@buoy-gg/shared-ui";
 import { storageEventStore } from "../stores/storageEventStore";
 
 // Re-export StorageEvent for convenience
@@ -36,60 +37,22 @@ export function useStorageEvents(options = {}) {
     maxEvents = 500,
     enabled = true
   } = options;
-  const [events, setEvents] = useState([]);
-  // Track capturing state locally so it updates reactively with the subscription
-  const [isCapturing, setIsCapturing] = useState(enabled);
-
-  // Subscribe to store - this automatically starts/stops the storage listener
-  // based on subscriber count (Subscribable pattern from TanStack Query)
-  // Only subscribe when enabled is true
-  useEffect(() => {
-    if (!enabled) {
-      setIsCapturing(false);
-      return;
-    }
-
-    // Frame-coalesced (same pattern as network's useNetworkEventList):
-    // bursts of storage writes land as ONE commit per frame instead of
-    // one per emission — the dominant live-churn cost measured on the
-    // network tool (tool-bench 2026-07-06).
-    let rafId = null;
-    let pending = null;
-    const unsubscribe = storageEventStore.subscribeToEvents(allEvents => {
-      pending = allEvents;
-      if (rafId != null) return;
-      rafId = requestAnimationFrame(() => {
-        rafId = null;
-        if (!pending) return;
-        // Filter by storage type if specified
-        let filtered = pending;
-        pending = null;
-        if (storageType !== "all") {
-          filtered = filtered.filter(e => e.storageType === storageType);
-        }
-        // Limit events
-        if (filtered.length > maxEvents) {
-          filtered = filtered.slice(0, maxEvents);
-        }
-        setEvents(filtered);
-      });
-    });
-
-    // Mark as capturing after successful subscription
-    setIsCapturing(true);
-    return () => {
-      unsubscribe();
-      if (rafId != null) cancelAnimationFrame(rafId);
-      // Note: Don't set isCapturing=false here because we might be
-      // re-subscribing due to dependency change, not actually stopping
-    };
-  }, [storageType, maxEvents, enabled]);
-  const clearEvents = useCallback(() => {
-    storageEventStore.clearEvents();
-  }, []);
+  // Stable per storageType so the shared hook doesn't resubscribe every render.
+  const select = useMemo(() => storageType === "all" ? undefined : events => events.filter(e => e.storageType === storageType), [storageType]);
+  // Subscribing auto-starts the storage listener (Subscribable pattern), and
+  // the shared hook frame-coalesces write bursts into one commit.
+  const {
+    events,
+    clearEvents,
+    isActive
+  } = useEventStoreEvents(storageEventStore, {
+    maxEvents,
+    enabled,
+    select
+  });
   return {
     events,
     clearEvents,
-    isCapturing
+    isCapturing: isActive
   };
 }

package/lib/module/storage/utils/snapshotProvider.js

@@ -18,7 +18,7 @@
  * - SecureStore keys outside the registered descriptor list are invisible.
  */
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { isDevToolsStorageKey, registerStateSnapshotProvider } from "@buoy-gg/shared-ui";
+import { classifyPreviewItem, createRestoreScope, emptyRestoreResult, failedRestore, isDevToolsStorageKey, registerStateSnapshotProvider, unionKeys, wontApply } from "@buoy-gg/shared-ui";
 import { readMany, writeMany, removeMany } from "./asyncStorageCompat";
 import { clearAllAppStorage } from "./clearAllStorage";
 import { mmkvInstanceRegistry } from "./MMKVInstanceRegistry";
@@ -106,24 +106,12 @@ async function capture() {
 }
 async function restore(data, options) {
   const snapshot = data;
-  const excludedSet = new Set(options?.excludeKeys ?? []);
-  const includedSet = options?.includeKeys ? new Set(options.includeKeys) : null;
+  const scope = createRestoreScope(options);
   /** True when this item may be touched (scope + exclusions agree). */
-  const touch = key => !excludedSet.has(key) && (!includedSet || includedSet.has(key));
-  let excludedHits = 0;
-  const result = {
-    ok: true,
-    applied: 0,
-    skipped: [],
-    warnings: []
-  };
+  const touch = scope.touch;
+  const result = emptyRestoreResult();
   if (!snapshot) {
-    return {
-      ok: false,
-      applied: 0,
-      skipped: [],
-      warnings: ["empty storage snapshot"]
-    };
+    return failedRestore("empty storage snapshot");
   }
 
   // ── AsyncStorage: delete app keys missing from the snapshot, write the rest ──
@@ -132,7 +120,7 @@ async function restore(data, options) {
     const snapKeys = new Set(snapPairs.map(([k]) => k));
     const liveKeys = (await AsyncStorage.getAllKeys()).filter(k => !isDevToolsStorageKey(k));
     const toRemove = liveKeys.filter(k => !snapKeys.has(k) && touch(`async:${k}`));
-    excludedHits += (snapshot.async ?? []).length - snapPairs.length;
+    scope.countExcluded((snapshot.async ?? []).length - snapPairs.length);
     if (toRemove.length > 0) await removeMany(toRemove);
     if (snapPairs.length > 0) await writeMany(snapPairs);
     result.applied += snapPairs.length + toRemove.length;
@@ -165,10 +153,7 @@ async function restore(data, options) {
       const snapKeys = new Set(entries.map(e => e.key));
       const liveKeys = instance.getAllKeys().filter(key => !isDevToolsStorageKey(key));
       for (const key of liveKeys) {
-        if (!touch(`mmkv:${id}/${key}`)) {
-          excludedHits += 1;
-          continue;
-        }
+        if (!scope.allows(`mmkv:${id}/${key}`)) continue;
         if (!snapKeys.has(key)) {
           deleteMMKVKey(instance, key);
           result.applied += 1;
@@ -199,10 +184,7 @@ async function restore(data, options) {
     key,
     options
   } of secureStoreRegistry.getAll()) {
-    if (!touch(`secure:${key}`)) {
-      excludedHits += 1;
-      continue;
-    }
+    if (!scope.allows(`secure:${key}`)) continue;
     if (options.requireAuthentication) {
       if (key in secureSnap) {
         result.skipped.push({
@@ -235,20 +217,14 @@ async function restore(data, options) {
       });
     }
   }
-  if (excludedHits > 0) {
-    result.warnings.push(`${excludedHits} item(s) excluded by you`);
-  }
+  const excludedWarning = scope.excludedWarning("item(s)");
+  if (excludedWarning) result.warnings.push(excludedWarning);
   return result;
 }
 
 /** Wipe to fresh-install state (Buoy keys preserved). Used by baseline restore. */
 async function clear() {
-  const result = {
-    ok: true,
-    applied: 0,
-    skipped: [],
-    warnings: []
-  };
+  const result = emptyRestoreResult();
   try {
     await clearAllAppStorage();
     result.applied += 1;
@@ -299,40 +275,24 @@ async function clear() {
   return result;
 }
 const ITEM_RENDER_CHAR_LIMIT = 256 * 1024;
+
+/**
+ * Storage values are strings (or MMKV primitives): identity equality and a
+ * character-length size gate are the right tests, not a deep walk.
+ */
 function classifyValue(key, label, oldValue, newValue, inOld, inNew) {
-  if (!inNew) return {
+  return classifyPreviewItem({
     key,
     label,
-    verdict: "removed",
-    oldValue
-  };
-  if (!inOld) return {
-    key,
-    label,
-    verdict: "added",
-    newValue
-  };
-  if (Object.is(oldValue, newValue)) return {
-    key,
-    label,
-    verdict: "unchanged"
-  };
-  const tooLarge = typeof oldValue === "string" && oldValue.length > ITEM_RENDER_CHAR_LIMIT || typeof newValue === "string" && newValue.length > ITEM_RENDER_CHAR_LIMIT;
-  if (tooLarge) {
-    return {
-      key,
-      label,
-      verdict: "too-large",
-      reason: "value too large to render a diff — restore still applies it"
-    };
-  }
-  return {
-    key,
-    label,
-    verdict: "changed",
     oldValue,
-    newValue
-  };
+    newValue,
+    inOld,
+    inNew
+  }, {
+    equal: Object.is,
+    tooLarge: value => typeof value === "string" && value.length > ITEM_RENDER_CHAR_LIMIT,
+    tooLargeReason: "value too large to render a diff — restore still applies it"
+  });
 }
 
 /** Per-key restore preview across all three backends. */
@@ -354,46 +314,31 @@ async function previewItems(target, base) {
   // ── AsyncStorage ──
   const oldAsync = new Map(baseData.async ?? []);
   const newAsync = new Map(targetData.async ?? []);
-  for (const key of new Set([...oldAsync.keys(), ...newAsync.keys()])) {
+  for (const key of unionKeys(oldAsync, newAsync)) {
     if (isDevToolsStorageKey(key)) continue;
     items.push(classifyValue(`async:${key}`, key, oldAsync.get(key), newAsync.get(key), oldAsync.has(key), newAsync.has(key)));
   }
 
   // ── MMKV ──
-  const instanceIds = new Set([...Object.keys(baseData.mmkv ?? {}), ...Object.keys(targetData.mmkv ?? {})]);
-  for (const id of instanceIds) {
+  for (const id of unionKeys(baseData.mmkv, targetData.mmkv)) {
     const registered = liveMode ? mmkvInstanceRegistry.get(id) : null;
     const instanceUnavailable = liveMode && !registered;
     const readOnly = liveMode && registered?.instance.isReadOnly === true;
     const oldEntries = new Map((baseData.mmkv?.[id] ?? []).map(e => [e.key, e]));
     const newEntries = new Map((targetData.mmkv?.[id] ?? []).map(e => [e.key, e]));
-    for (const key of new Set([...oldEntries.keys(), ...newEntries.keys()])) {
+    for (const key of unionKeys(oldEntries, newEntries)) {
       if (isDevToolsStorageKey(key)) continue;
       const itemKey = `mmkv:${id}/${key}`;
       const label = `${id} · ${key}`;
       const oldE = oldEntries.get(key);
       const newE = newEntries.get(key);
       let item = classifyValue(itemKey, label, oldE?.value, newE?.value, oldEntries.has(key), newEntries.has(key));
-      if (item.verdict !== "unchanged") {
-        if (instanceUnavailable) {
-          item = {
-            ...item,
-            verdict: "wont-apply",
-            reason: "MMKV instance not registered"
-          };
-        } else if (readOnly) {
-          item = {
-            ...item,
-            verdict: "wont-apply",
-            reason: "MMKV instance registered read-only"
-          };
-        } else if (newE?.valueType === "buffer" || oldE?.valueType === "buffer") {
-          item = {
-            ...item,
-            verdict: "wont-apply",
-            reason: "ArrayBuffer values cannot be restored"
-          };
-        }
+      if (instanceUnavailable) {
+        item = wontApply(item, "MMKV instance not registered");
+      } else if (readOnly) {
+        item = wontApply(item, "MMKV instance registered read-only");
+      } else if (newE?.valueType === "buffer" || oldE?.valueType === "buffer") {
+        item = wontApply(item, "ArrayBuffer values cannot be restored");
       }
       items.push(item);
     }
@@ -403,22 +348,14 @@ async function previewItems(target, base) {
   const oldSecure = baseData.secure ?? {};
   const newSecure = targetData.secure ?? {};
   const registeredSecure = liveMode ? new Map(secureStoreRegistry.getAll().map(e => [e.key, e])) : null;
-  for (const key of new Set([...Object.keys(oldSecure), ...Object.keys(newSecure)])) {
+  for (const key of unionKeys(oldSecure, newSecure)) {
     let item = classifyValue(`secure:${key}`, key, oldSecure[key], newSecure[key], key in oldSecure, key in newSecure);
-    if (liveMode && item.verdict !== "unchanged") {
+    if (liveMode) {
       const entry = registeredSecure?.get(key);
       if (!entry) {
-        item = {
-          ...item,
-          verdict: "wont-apply",
-          reason: "key no longer registered with registerSecureStoreKeys"
-        };
+        item = wontApply(item, "key no longer registered with registerSecureStoreKeys");
       } else if (entry.options.requireAuthentication) {
-        item = {
-          ...item,
-          verdict: "wont-apply",
-          reason: "biometric-protected keys are never written"
-        };
+        item = wontApply(item, "biometric-protected keys are never written");
       }
     }
     items.push(item);

package/lib/typescript/preset.d.ts

@@ -62,18 +62,12 @@ export declare const storageToolPreset: {
  * });
  * ```
  */
-export declare function createStorageTool(options?: {
-    /** Tool name (default: "STORAGE") */
-    name?: string;
-    /** Tool description */
-    description?: string;
-    /** Custom tool ID (default: "storage") */
-    id?: string;
+export declare const createStorageTool: (options?: ({
     /** Array of required storage keys to validate */
     requiredStorageKeys?: RequiredStorageKey[];
     /** Enable shared modal dimensions */
     enableSharedModalDimensions?: boolean;
-}): {
+} & import("@buoy-gg/shared-ui").ToolPresetOverrides) | undefined) => {
     id: string;
     name: string;
     description: string;

package/lib/typescript/preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preset.d.ts","sourceRoot":"","sources":["../../src/preset.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB;;;;;qBAKX;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;;6BAGJ,kBAAkB,EAAE;;;CAGlD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAC1C,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iDAAiD;IACjD,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C,qCAAqC;IACrC,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;;;;;qBAMoB;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;;;;;EAUpC"}
+{"version":3,"file":"preset.d.ts","sourceRoot":"","sources":["../../src/preset.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB;;;;;qBAKX;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;;6BAGJ,kBAAkB,EAAE;;;CAGjD,CAAC;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,iBAAiB;IAG1B,iDAAiD;0BAC3B,kBAAkB,EAAE;IAC1C,qCAAqC;kCACP,OAAO;;;;;;qBAtCtB;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;;6BAGJ,kBAAkB,EAAE;;;CAwClD,CAAC"}

package/lib/typescript/storage/components/StorageModalWithTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageModalWithTabs.d.ts","sourceRoot":"","sources":["../../../../src/storage/components/StorageModalWithTabs.tsx"],"names":[],"mappings":"AAkCA,OAAO,EAAE,kBAAkB,EAAkB,MAAM,UAAU,CAAC;AAY9D,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAchF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,QAAqC,CAAC;AAExE,UAAU,yBAAyB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,QAAQ,KAAK,IAAI,CAAC;IAClD;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC/C;AAqBD,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,2BAAmC,EACnC,mBAAwB,EACxB,MAAc,EACd,WAAW,EACX,SAAS,EACT,aAAa,GACd,EAAE,yBAAyB,sCAsiC3B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,KAAK,GAAE,IAAI,CAAC,yBAAyB,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,+BAG9E"}
+{"version":3,"file":"StorageModalWithTabs.d.ts","sourceRoot":"","sources":["../../../../src/storage/components/StorageModalWithTabs.tsx"],"names":[],"mappings":"AAmCA,OAAO,EAAE,kBAAkB,EAAkB,MAAM,UAAU,CAAC;AAY9D,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAchF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,QAAqC,CAAC;AAExE,UAAU,yBAAyB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,QAAQ,KAAK,IAAI,CAAC;IAClD;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC/C;AA0DD,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,2BAAmC,EACnC,mBAAwB,EACxB,MAAc,EACd,WAAW,EACX,SAAS,EACT,aAAa,GACd,EAAE,yBAAyB,sCA24B3B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,KAAK,GAAE,IAAI,CAAC,yBAAyB,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,+BAG9E"}

package/lib/typescript/storage/hooks/useStorageEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useStorageEvents.d.ts","sourceRoot":"","sources":["../../../../src/storage/hooks/useStorageEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AAGrC,YAAY,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,uBAAuB;IACtC,6BAA6B;IAC7B,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IACvC,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mFAAmF;IACnF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,wCAAwC;IACxC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,uBAAuB;IACvB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,0DAA0D;IAC1D,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,GAAE,uBAA4B,GACpC,sBAAsB,CA8DxB"}
+{"version":3,"file":"useStorageEvents.d.ts","sourceRoot":"","sources":["../../../../src/storage/hooks/useStorageEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AAGrC,YAAY,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,uBAAuB;IACtC,6BAA6B;IAC7B,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IACvC,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mFAAmF;IACnF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,wCAAwC;IACxC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,uBAAuB;IACvB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,0DAA0D;IAC1D,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,GAAE,uBAA4B,GACpC,sBAAsB,CAkBxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buoy-gg/storage",
-  "version": "7.0.33",
+  "version": "7.0.34",
   "description": "Browse & edit AsyncStorage, MMKV & SecureStore inside your React Native app, with change history. Part of Buoy devtools.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -29,11 +29,11 @@
     "**/snapshotProvider.ts"
   ],
   "dependencies": {
-    "@buoy-gg/floating-tools-core": "^7.0.33",
-    "@buoy-gg/shared-ui": "^7.0.33"
+    "@buoy-gg/floating-tools-core": "^7.0.34",
+    "@buoy-gg/shared-ui": "^7.0.34"
   },
   "peerDependencies": {
-    "@buoy-gg/license": "7.0.33",
+    "@buoy-gg/license": "7.0.34",
     "@react-native-async-storage/async-storage": "^2.0.0 || ^3.1.0",
     "react": "*",
     "react-native": "*"
@@ -43,7 +43,7 @@
     "@types/react": "^19.1.0",
     "@types/react-native": "^0.73.0",
     "typescript": "~5.8.3",
-    "@buoy-gg/license": "^7.0.33"
+    "@buoy-gg/license": "^7.0.34"
   },
   "react-native-builder-bob": {
     "source": "src",